Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7323eecb authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Disable installation via adb restore 

Test: tried to install apk via adb restore -> was not installed
Bug: 16298482
Change-Id: I91e61cd229499f2ba8519554f4836f1e0b9f6404
parent 79c238ad

services/backup/java/com/android/server/backup/utils/RestoreUtils.java

+11 −4
Original line number Diff line number Diff line
@@ -102,7 +102,9 @@ public class RestoreUtils { 
                        }

                    }



                    session.commit(receiver.getIntentSender());

                    // Installation is current disabled

                    session.abandon();

                    // session.commit(receiver.getIntentSender());

                }

            } catch (Exception t) {

                installer.abandonSession(sessionId);
@@ -110,9 +112,14 @@ public class RestoreUtils { 
                throw t;

            }



            Intent result = receiver.getResult();

            int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS,

                    PackageInstaller.STATUS_FAILURE);

            // Installation is current disabled

            Intent result = null;

            // Intent result = receiver.getResult();



            // Installation is current disabled

            int status = PackageInstaller.STATUS_FAILURE;

            // int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS,

            //        PackageInstaller.STATUS_FAILURE);



            if (status != PackageInstaller.STATUS_SUCCESS) {

                // The only time we continue to accept install of data even if the