diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:41:42 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:41:42 +0000 |
| commit | 1cdd1b5ad204cb319174f86b522fcb0dc7968ed6 (patch) | |
| tree | 208c78f58721f44168992cf88ae8d2b821f090de /cmds/installd/installd.h | |
| parent | 5e78568dab3b1bbddd1cbc0dd2004d9c2ddbdfeb (diff) | |
| parent | 3492a21877f93b2240dc823392b7e8adb2e1809e (diff) | |
| download | frameworks_native-1cdd1b5ad204cb319174f86b522fcb0dc7968ed6.zip frameworks_native-1cdd1b5ad204cb319174f86b522fcb0dc7968ed6.tar.gz frameworks_native-1cdd1b5ad204cb319174f86b522fcb0dc7968ed6.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
include/android/input.h
Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b
Diffstat (limited to 'cmds/installd/installd.h')
| -rw-r--r-- | cmds/installd/installd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/installd/installd.h b/cmds/installd/installd.h index 1f70181..2745ba0 100644 --- a/cmds/installd/installd.h +++ b/cmds/installd/installd.h @@ -243,7 +243,7 @@ int get_size(const char *uuid, const char *pkgname, int userid, int free_cache(const char *uuid, int64_t free_size); int dexopt(const char *apk_path, uid_t uid, bool is_public, const char *pkgName, const char *instruction_set, int dexopt_needed, bool vm_safe_mode, - bool debuggable, const char* oat_dir); + bool debuggable, const char* oat_dir, bool boot_complete); int mark_boot_complete(const char *instruction_set); int movefiles(); int linklib(const char* uuid, const char* pkgname, const char* asecLibDir, int userId); |