Merge "Fix requestRestore() of an app's own package" into mnc-dev

                throw new SecurityException("No permission to restore other packages");

            }

            // So far so good; we're allowed to try to restore this package.  Now

            // check whether there is data for it in the current dataset, falling back

            // So far so good; we're allowed to try to restore this package.

            long oldId = Binder.clearCallingIdentity();

            try {

                // Check whether there is data for it in the current dataset, falling back

                // to the ancestral dataset if not.

                long token = getAvailableRestoreToken(packageName);

                if (DEBUG) Slog.v(TAG, "restorePackage pkg=" + packageName

                mBackupHandler.removeMessages(MSG_RESTORE_TIMEOUT);

                // Ready to go:  enqueue the restore request and claim success

            long oldId = Binder.clearCallingIdentity();

                mWakelock.acquire();

                if (MORE_DEBUG) {

                    Slog.d(TAG, "restorePackage() : " + packageName);

                msg.obj = new RestoreParams(mRestoreTransport, dirName,

                        observer, token, app, 0);

                mBackupHandler.sendMessage(msg);

            } finally {

                Binder.restoreCallingIdentity(oldId);

            }

            return 0;

        }