@@ -415,7 +415,7 @@ describe('AppComponent', () => {
     snackbar = dom.getSnackBar();
     snackbar.checkText(firstMessage.getMessage());
 
-    snackbar.findAndClick('.snack-bar-action');
+    snackbar.findAndClick('.snack-bar-actions .close-button');
     await dom.whenRenderingDone();
     snackbar = dom.getSnackBar();
     snackbar.checkText(secondMessage.getMessage());
 
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import {ClipboardModule} from '@angular/cdk/clipboard';
 import {CommonModule} from '@angular/common';
 import {
   Component,
@@ -97,6 +98,7 @@ describe('CollectTracesComponent', () => {
         MatSelectModule,
         MatFormFieldModule,
         MatInputModule,
+        ClipboardModule,
       ],
       providers: [MatSnackBar],
       declarations: [
 
@@ -26,7 +26,7 @@ import {MatSnackBarRef, MAT_SNACK_BAR_DATA} from '@angular/material/snack-bar';
           {{ message }}
         </p>
       </div>
-      <div class="snackbar-actions">
+      <div class="snack-bar-actions">
         <button
           color="primary"
           mat-button
@@ -57,7 +57,7 @@ import {MatSnackBarRef, MAT_SNACK_BAR_DATA} from '@angular/material/snack-bar';
       .message {
         padding-block-end: 4px;
       }
-      .snackbar-actions {
+      .snack-bar-actions {
         display: flex;
         justify-content: center;
       }
 
@@ -54,12 +54,12 @@ describe('SnackBarComponent', () => {
   });
 
   it('dismisses snackbar on close button click', () => {
-    dom.findAndClick('.snackbar-actions .close-button');
+    dom.findAndClick('.snack-bar-actions .close-button');
     expect(mockSnackbarRef.dismiss).toHaveBeenCalledTimes(1);
   });
 
   it('copies messages on copy button click', () => {
-    dom.findAndClick('.snackbar-actions .copy-button');
+    dom.findAndClick('.snack-bar-actions .copy-button');
     expect(mockCopyText).toHaveBeenCalledOnceWith(messages.join('\n\n'));
   });
 });
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import {ClipboardModule} from '@angular/cdk/clipboard';
 import {Overlay} from '@angular/cdk/overlay';
 import {TestBed} from '@angular/core/testing';
 import {MatSnackBar, MatSnackBarRef} from '@angular/material/snack-bar';
@@ -39,7 +40,7 @@ describe('SnackBarOpener', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [SnackBarOpener, MatSnackBar, Overlay],
-      imports: [BrowserAnimationsModule],
+      imports: [BrowserAnimationsModule, ClipboardModule],
       declarations: [SnackBarComponent],
     });
     snackBarOpener = TestBed.inject(SnackBarOpener);
 
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import {ClipboardModule} from '@angular/cdk/clipboard';
 import {TestBed} from '@angular/core/testing';
 import {MatCardModule} from '@angular/material/card';
 import {MatCheckboxModule} from '@angular/material/checkbox';
@@ -63,6 +64,7 @@ describe('UploadTracesComponent', () => {
         MatProgressBarModule,
         MatTooltipModule,
         MatCheckboxModule,
+        ClipboardModule,
       ],
       providers: [MatSnackBar],
       declarations: [UploadTracesComponent, LoadProgressComponent],
 
@@ -64,6 +64,11 @@ export abstract class AdbDeviceConnection {
     return `${status}${this.model} (${this.id})`;
   }
 
+  async checkRoot(): Promise<boolean> {
+    const root = await this.runShellCommand('su root id -u');
+    return root === '0';
+  }
+
   async updateAvailableTraces() {
     if (
       this.state === AdbDeviceState.AVAILABLE &&
@@ -81,22 +86,25 @@ export abstract class AdbDeviceConnection {
   }
 
   async findFiles(path: string, matchers: string[]): Promise<string[]> {
+    const errors = ['No such file', 'Permission denied'];
     if (matchers.length === 0) {
       matchers.push('');
     }
+    const isRoot = await this.checkRoot();
     for (const matcher of matchers) {
-      let matchingFiles: string;
+      let findCmd = `find ${path}`;
       if (matcher.length > 0) {
-        matchingFiles = await this.runShellCommand(
-          `su root find ${path} -name ${matcher}`,
-        );
-      } else {
-        matchingFiles = await this.runShellCommand(`su root find ${path}`);
+        findCmd += ` -name ${matcher}`;
+      }
+      if (isRoot) {
+        findCmd = 'su root ' + findCmd;
       }
+      const matchingFiles = await this.runShellCommand(findCmd);
       const files = matchingFiles
         .split('\n')
         .filter(
-          (file) => !file.includes('No such file') && file.trim().length > 0,
+          (maybeFile) =>
+            !errors.includes(maybeFile) && maybeFile.trim().length > 0,
         );
       if (files.length > 0) {
         return files;
 
@@ -169,11 +169,25 @@ describe('AdbDeviceConnection', () => {
   });
 
   it('finds files via exact filepath', async () => {
+    runShellCmdSpy.withArgs('find filepath').and.returnValue('file');
+    expect(await connection.findFiles('filepath', [])).toEqual(['file']);
+  });
+
+  it('finds files via exact filepath as root', async () => {
+    setDeviceAsRoot();
     runShellCmdSpy.withArgs('su root find filepath').and.returnValue('file');
     expect(await connection.findFiles('filepath', [])).toEqual(['file']);
   });
 
   it('finds files via first matcher', async () => {
+    runShellCmdSpy.withArgs('find filepath -name m1').and.returnValue('file');
+    expect(await connection.findFiles('filepath', ['m1', 'm2'])).toEqual([
+      'file',
+    ]);
+  });
+
+  it('finds files via first matcher as root', async () => {
+    setDeviceAsRoot();
     runShellCmdSpy
       .withArgs('su root find filepath -name m1')
       .and.returnValue('file');
@@ -183,6 +197,14 @@ describe('AdbDeviceConnection', () => {
   });
 
   it('finds files via second matcher', async () => {
+    runShellCmdSpy.withArgs('find filepath -name m2').and.returnValue('file');
+    expect(await connection.findFiles('filepath', ['m1', 'm2'])).toEqual([
+      'file',
+    ]);
+  });
+
+  it('finds files via second matcher as root', async () => {
+    setDeviceAsRoot();
     runShellCmdSpy
       .withArgs('su root find filepath -name m2')
       .and.returnValue('file');
@@ -192,16 +214,33 @@ describe('AdbDeviceConnection', () => {
   });
 
   it('handles "No such file" error', async () => {
+    runShellCmdSpy.withArgs('find filepath').and.returnValue('No such file');
+    expect(await connection.findFiles('filepath', [])).toEqual([]);
+  });
+
+  it('handles "Permission denied" error', async () => {
     runShellCmdSpy
       .withArgs('su root find filepath')
-      .and.returnValue('No such file');
+      .and.returnValue('Permission denied');
     expect(await connection.findFiles('filepath', [])).toEqual([]);
   });
 
   it('ignores whitespace', async () => {
-    runShellCmdSpy
-      .withArgs('su root find filepath')
-      .and.returnValue('file\n  ');
+    runShellCmdSpy.withArgs('find filepath').and.returnValue('file\n  ');
     expect(await connection.findFiles('filepath', [])).toEqual(['file']);
   });
+
+  it('checks root and returns true for "0" output', async () => {
+    setDeviceAsRoot();
+    expect(await connection.checkRoot()).toBeTrue();
+  });
+
+  it('checks root and returns false for non "0" output', async () => {
+    setDeviceAsRoot();
+    expect(await connection.checkRoot()).toBeTrue();
+  });
+
+  function setDeviceAsRoot() {
+    runShellCmdSpy.withArgs('su root id -u').and.returnValue('0');
+  }
 });
@@ -48,6 +48,9 @@ export class TracingSession {
   }
 
   async moveFiles(device: AdbDeviceConnection) {
+    const isRoot = await device.checkRoot();
+    const maybeRootParam = isRoot ? 'su root ' : '';
+
     for (const file of this.target.fileIdentifiers) {
       const filepaths = await device.findFiles(file.path, file.matchers);
 
@@ -57,7 +60,12 @@ export class TracingSession {
         );
         try {
           await device.runShellCommand(
-            `su root [ ! -f ${filepath} ] || su root mv ${filepath} ${WINSCOPE_BACKUP_DIR}${file.destName}`,
+            maybeRootParam +
+              `[ -f ${filepath} ] && ` +
+              maybeRootParam +
+              `cp ${filepath} ${WINSCOPE_BACKUP_DIR}${file.destName} && ` +
+              maybeRootParam +
+              `rm -f ${filepath}`,
           );
           console.debug(
             `Moved ${filepath} to ${WINSCOPE_BACKUP_DIR}${file.destName} on device`,
 
@@ -36,8 +36,8 @@ describe('TracingSession', () => {
     listener,
   );
   const fileIdentifiers = [
-    new AdbFileIdentifier('test path 1', ['matcher'], 'saved file 1'),
-    new AdbFileIdentifier('test path 2', ['matcher'], 'saved file 2'),
+    new AdbFileIdentifier('test path 1', ['matcher'], 'saved_file_1'),
+    new AdbFileIdentifier('test path 2', ['matcher'], 'saved_file_2'),
   ];
   const sessionName = 'TestSession';
   const stopCmd = 'test stop cmd';
@@ -108,19 +108,45 @@ describe('TracingSession', () => {
       ['test path 2', ['matcher']],
     ]);
     expect(runShellCmdSpy.calls.allArgs()).toEqual([
+      ['su root id -u'],
       [
-        `su root [ ! -f file ] || su root mv file ${WINSCOPE_BACKUP_DIR}saved file 1`,
+        `[ -f file ] && cp file ${WINSCOPE_BACKUP_DIR}saved_file_1 && rm -f file`,
       ],
       [
-        `su root [ ! -f file ] || su root mv file ${WINSCOPE_BACKUP_DIR}saved file 2`,
+        `[ -f file ] && cp file ${WINSCOPE_BACKUP_DIR}saved_file_2 && rm -f file`,
+      ],
+    ]);
+  });
+
+  it('moves files as root', async () => {
+    runShellCmdSpy.and.returnValue(Promise.resolve(''));
+    setDeviceAsRoot();
+    await session.moveFiles(mockDevice);
+    expect(findFilesSpy.calls.allArgs()).toEqual([
+      ['test path 1', ['matcher']],
+      ['test path 2', ['matcher']],
+    ]);
+    expect(runShellCmdSpy.calls.allArgs()).toEqual([
+      ['su root id -u'],
+      [
+        `su root [ -f file ] && su root cp file ${WINSCOPE_BACKUP_DIR}saved_file_1 && su root rm -f file`,
+      ],
+      [
+        `su root [ -f file ] && su root cp file ${WINSCOPE_BACKUP_DIR}saved_file_2 && su root rm -f file`,
       ],
     ]);
   });
 
   it('handles error in move command', async () => {
+    runShellCmdSpy.and.returnValue(Promise.resolve(''));
+    runShellCmdSpy
+      .withArgs(
+        `[ -f file ] && cp file ${WINSCOPE_BACKUP_DIR}saved_file_1 && rm -f file`,
+      )
+      .and.throwError(new Error());
     runShellCmdSpy
       .withArgs(
-        `su root [ ! -f file ] || su root mv file ${WINSCOPE_BACKUP_DIR}saved file 1`,
+        `[ -f file ] && cp file ${WINSCOPE_BACKUP_DIR}saved_file_2 && rm -f file`,
       )
       .and.throwError(new Error());
     await expectAsync(session.moveFiles(mockDevice)).toBeResolved();
@@ -133,4 +159,10 @@ describe('TracingSession', () => {
       expect(endTraceSpy).toHaveBeenCalledWith(...endArgs);
     }
   }
+
+  function setDeviceAsRoot() {
+    runShellCmdSpy
+      .withArgs('su root id -u')
+      .and.returnValue(Promise.resolve('0'));
+  }
 });