Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
267,084 Commits 3 Branches 0 Tags
eba594fa1b31eb2ed51175eb08efe34dca18ce64
Commit Graph

3398 Commits

Author SHA1 Message Date
Felipe Leme
61da879b9c Merge \\"Added a getPrimaryStorageSize() method.\\" into nyc-mr1-dev am: ba3676460a 
am: 02e2d72d55

Change-Id: I71a1554683697b5b6dde0c47bc2a4464b56b691b
 2016-06-08 01:31:14 +00:00
TreeHugger Robot
ba3676460a Merge "Added a getPrimaryStorageSize() method." into nyc-mr1-dev 2016-06-08 01:22:18 +00:00
Felipe Leme
18202e00bd Added a getPrimaryStorageSize() method. 
BUG: 24128505

Change-Id: I0b75d3c5505dadedf5d06868614b3a01765cc5d3

** Cherrypicked from master **
 2016-06-07 16:42:35 -07:00
Esteban Talavera
8ceec9a1fb Merge "Fix getApplicationRestrictions documentation" into nyc-dev am: a86d6c4df3 am: cc12064670 
am: 9bf7bd1728

* commit '9bf7bd17284152d28458530f6d58f5233c8a3d2b':
  Fix getApplicationRestrictions documentation

Change-Id: Ib86f9b8a02641426aa80a35d55b26972d66a7b7f
 2016-06-07 18:08:48 +00:00
Esteban Talavera
cc12064670 Merge "Fix getApplicationRestrictions documentation" into nyc-dev 
am: a86d6c4df3

* commit 'a86d6c4df3b193060b4b725e1abfed4f69689843':
  Fix getApplicationRestrictions documentation

Change-Id: Ia552cc886a182f558b7479b1d2a0201061dc5cc6
 2016-06-07 17:59:01 +00:00
Esteban Talavera
953fe48329 Fix getApplicationRestrictions documentation 
The method never returns null, only empty bundle

Bug: 29178626
Change-Id: Ic53154eafe94c6c501b59932441d7ae1c89cb689
 2016-06-07 17:21:49 +01:00
Benjamin Franz
042dd1cee6 Merge "Add an intent extra to force master clear" into nyc-mr1-dev am: 3c826b160c 
am: 8f79bc6c77

* commit '8f79bc6c7799e2edf3bc13cb82c0972ceeb5edab':
  Add an intent extra to force master clear

Change-Id: I4af0022ec5834d2669321d5c9c76956539c8ead7
 2016-06-01 21:08:13 +00:00
Benjamin Franz
3c826b160c Merge "Add an intent extra to force master clear" into nyc-mr1-dev 2016-06-01 17:13:15 +00:00
Benjamin Franz
f9d5e6a3db Add an intent extra to force master clear 
Currently, if a priv-app sends ACTION_MASTER_CLEAR, whilst
DISALLOW_FACTORY_RESET is set, the factory reset is blocked. This CL
introduces a new extra for master clear that let's the priv-app bypass
the user restriction.

Bug: 28689894
Change-Id: I4bf979a3826454e977f1abff4562f85c8d0eec4a
 2016-06-01 15:45:59 +01:00
Wei Wang
ac02eee133 Merge "Trigger power hints for activity launch" into nyc-mr1-dev am: 2ab4ac3835 
am: 3f1fa8f432

* commit '3f1fa8f43219634c1deb8420d962b0f43c35ccb5':
  Trigger power hints for activity launch

Change-Id: I57075b28d232b61f67e89a16f48c5ac7efeea05d
 2016-06-01 03:21:56 +00:00
Wei Wang
2ab4ac3835 Merge "Trigger power hints for activity launch" into nyc-mr1-dev 2016-06-01 03:06:38 +00:00
Wei Wang
98f03f98ac Trigger power hints for activity launch 
BUG: 28220567
Change-Id: Id2a0397efd1dd02ee50d5626edaed9e60ea6de8a
 2016-05-31 18:34:01 -07:00
Amith Yamasani
8adc553b3e Merge "Helper method to check if current user is a demo user" into nyc-mr1-dev am: 5df14a60cf 
am: df2297dcf3

* commit 'df2297dcf3b3a923207d1598dc4f6af0c1759241':
  Helper method to check if current user is a demo user

Change-Id: I8149210498462036659c1b6b8e8dd322e6dfa336
 2016-05-27 23:43:10 +00:00
Amith Yamasani
69c76ce387 Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev am: aabbfc5565 
am: a3bc135bb4

* commit 'a3bc135bb413bb159847926e0ccdf99acf125360':
  Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""

Change-Id: Ifa8f6f8e195bca93af058914c5b1797f3294df6e
 2016-05-27 23:35:36 +00:00
Ruchi Kandoi
3dc9df699b Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev am: 7730e57dc6 am: e9f42318f6 
am: fcb3aa4a68

* commit 'fcb3aa4a681021c95f55673f18141502667320e3':
  PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()

Change-Id: I2acde231a58d82ea15a20757dbf3bac8f9edbba6
 2016-05-27 22:53:48 +00:00
Bart Sears
63a75e3b89 Revert "Remove ActivityManager calls with PM.mInstallLock held" 
This reverts commit ac06a4907b.

Change-Id: I27bedbd221a8d416b9040a96063e66a1ca69fe2e
 2016-05-27 21:28:50 +00:00
TreeHugger Robot
5df14a60cf Merge "Helper method to check if current user is a demo user" into nyc-mr1-dev 2016-05-27 19:21:41 +00:00
Amith Yamasani
d35a89cd80 Helper method to check if current user is a demo user 
Bug: 27280140
Change-Id: I7f6ed3198a42b4f8b81b54764e0b73499a94f77c
 2016-05-27 11:13:00 -07:00
Fyodor Kupolov
2d8583e0e4 Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am: a4dbdaf5e9 am: 5d531e4f6c 
am: f6816ad3c5

* commit 'f6816ad3c5b4062ebe8cdb810aee70e9c9a34314':
  Remove ActivityManager calls with PM.mInstallLock held

Change-Id: I98ea0d1c547c5f044bf7fc9c231e7f19b6c39c95
 2016-05-27 17:50:31 +00:00
TreeHugger Robot
aabbfc5565 Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev 2016-05-27 17:36:43 +00:00
Ruchi Kandoi
e9f42318f6 Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev 
am: 7730e57dc6

* commit '7730e57dc6624a66cdc35260f855a467fadc7b04':
  PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()

Change-Id: If4934466722851e9c7ca1443cae3e31f2b25c6c7
 2016-05-27 16:28:03 +00:00
Amith Yamasani
ea1b9d7958 Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held"" 
Added the missing import.

This reverts commit c51e725644.

Change-Id: Icd63619a12e10dee628e568a6200d429a9936cf0
 2016-05-27 09:25:37 -07:00
Ruchi Kandoi
7730e57dc6 Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev 2016-05-27 16:20:43 +00:00
Jeff Sharkey
9b34b66b66 resolve merge conflicts of 58db550 to master 
Change-Id: I39f7760c008af1d4a107b6b929b44c79d2f463be
 2016-05-27 10:12:55 -06:00
Bart Sears
c51e725644 Revert "Remove ActivityManager calls with PM.mInstallLock held" 
This reverts commit ac06a4907b.

Change-Id: I27bedbd221a8d416b9040a96063e66a1ca69fe2e
 2016-05-27 04:18:50 +00:00
Fyodor Kupolov
5d531e4f6c Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev 
am: a4dbdaf5e9

* commit 'a4dbdaf5e96273dccd474e31700d84a1ad907503':
  Remove ActivityManager calls with PM.mInstallLock held

Change-Id: I3be800fc5de9fa3c06f0bf6158a0dbf2a05b165e
 2016-05-27 03:05:20 +00:00
Jeff Sharkey
bda14dd987 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev 
am: 36cbf5ca37

* commit '36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: I1ad2d1eba64a89e7a22dc86c7241f6f85a5f2a0b
 2016-05-27 02:42:44 +00:00
Fyodor Kupolov
63cd09dfb4 Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev am: 2c5cbd4012 
am: 0ebf3cc47c

* commit '0ebf3cc47c9d20613f02ca263a2394d80455a09a':
  Clean up demo dir when leaving demo mode

Change-Id: Ib3338a18e75f04e15a1d77a82e5ac1aba246a5bb
 2016-05-27 01:02:29 +00:00
Fyodor Kupolov
2c5cbd4012 Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev 2016-05-27 00:48:38 +00:00
Fyodor Kupolov
a4dbdaf5e9 Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev 2016-05-26 18:20:36 +00:00
Ruchi Kandoi
c45908d196 PowerManager: Adds Documentation to 
isSustainedPerformanceModeSupported()

Bug: 28775592
Change-Id: Iea4f77d2508141ac0748165f68e6e1ca235ab804
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2016-05-26 11:18:52 -07:00
TreeHugger Robot
36cbf5ca37 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev 2016-05-26 16:49:51 +00:00
Jeff Sharkey
4815ed4500 Cache IMountService for isUserKeyUnlocked() calls. 
This avoids doing a ServiceManager lookup for every call through
this hot code-path.

Bug: 28946245
Change-Id: I210ce34b33e5b40a5ab4e92ddce87fc5e9964be2
 2016-05-26 09:31:06 -06:00
Adam Powell
8c6e691c09 Merge "N is API 24" into nyc-dev am: bc983c4431 am: 0b478d5b05 
am: 3579a6a634

* commit '3579a6a63474918be6d7d3df21bcf132e8dc0e54':
  N is API 24

Change-Id: I15afe037702682bb124355b8da31af37444ded2b
 2016-05-26 02:21:03 +00:00
Adam Powell
3579a6a634 Merge "N is API 24" into nyc-dev am: bc983c4431 
am: 0b478d5b05

* commit '0b478d5b052c4440a0eb8686d400d1595ead1857':
  N is API 24

Change-Id: I90b772e177cefff1071a9859f046f683411a7e59
 2016-05-26 01:56:59 +00:00
Adam Powell
528a5bd466 Merge "N is API 24" into nyc-dev 
am: bc983c4431

* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
  N is API 24

Change-Id: Ic45d31eb721e9831fafd5413ce60947eb7fbad7e
 2016-05-26 01:21:19 +00:00
Adam Powell
43ec62af45 N is API 24 
Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08
 2016-05-25 16:42:56 -07:00
Fyodor Kupolov
ac06a4907b Remove ActivityManager calls with PM.mInstallLock held 
UserController now pushes user state to UMS.

PM now checks user running/unlocking/unlocked state by calling
UserManagerInternal.

Bug: 28090199
Change-Id: I20e62b37f78238f28dd81f49f876732bbd3c6b34
 2016-05-25 14:55:09 -07:00
TreeHugger Robot
e1b53d7cab Merge "Add missing @Deprecated annotations." 2016-05-25 17:46:40 +00:00
Fyodor Kupolov
88257587ce Clean up demo dir when leaving demo mode 
Delete contents of demo dir when device is provisioned and demo_mode is
disabled

Bug: 28855287
Change-Id: I6e1826ec23a2ff92402fe079a9e7b565a2fe04d7
 2016-05-24 18:24:52 -07:00
Chet Haase
2675da9dbf Merge "Remove hidden LocaleList default constructor" into nyc-dev am: ba2cc82399 am: f33737d646 
am: e8de8b7a3b

* commit 'e8de8b7a3b799ead315103c42d08d12a6151e02b':
  Remove hidden LocaleList default constructor

Change-Id: I7e60440bcd2360ed6181b3b5d96f8255e202d13a
 2016-05-25 01:11:49 +00:00
Chet Haase
f33737d646 Merge "Remove hidden LocaleList default constructor" into nyc-dev 
am: ba2cc82399

* commit 'ba2cc82399b89d92f766bbee3b2504a5cdf56215':
  Remove hidden LocaleList default constructor

Change-Id: Ia9416e9e318104dc0a29ce8b092036cf4d2b53a8
 2016-05-25 01:02:41 +00:00
Chet Haase
f3d5ec05b4 Remove hidden LocaleList default constructor 
Previous change hid this constructor. Now removing it entirely for completeness.

Issue #28296200  API Review: LocaleList

Change-Id: I43476994070b101999d338ec1f5d1a1a0a2a7658
 2016-05-24 16:07:00 -07:00
Aurimas Liutikas
514c5ef8d5 Add missing @Deprecated annotations. 
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.

Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
 2016-05-24 15:22:55 -07:00
Tianjie Xu
9ae172f9b9 Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9 am: 7135fab76c 
am: 375a512c0d

* commit '375a512c0d99e58285b3e6d6f1045c5e3a9774d5':
  Report OTA time statistics

Change-Id: Icbd611fe4af2dd51d1ee946a80c0e0f4370a9634
 2016-05-24 21:59:28 +00:00
Tianjie Xu
375a512c0d Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9 
am: 7135fab76c

* commit '7135fab76cb3e7f7a68547794b3ddf54f08facca':
  Report OTA time statistics

Change-Id: I82f174bfa383a26a87d45ac6675a3ae5812b50af
 2016-05-24 21:47:52 +00:00
Adam Lesinski
534881d8fa Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e106dea45 
am: 9ed84d8612

* commit '9ed84d86120dd6487eacba503f45f6d147f05fbf':
  Improve performance of LocaleList with Resources

Change-Id: I7c1694545f9eee940ca7065f3ac5aee5e2a7b27c
 2016-05-24 21:47:36 +00:00
Adam Lesinski
9ed84d8612 Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb 
am: 5e106dea45

* commit '5e106dea4545547f3f7c50dad30f792809659b96':
  Improve performance of LocaleList with Resources

Change-Id: I733cdad0b30069ac7830fa91ef0188dd0f0cfac9
 2016-05-24 21:41:20 +00:00
Tianjie Xu
acf91cd6c5 Merge "Report OTA time statistics" into nyc-dev 
am: 86f97177e9

* commit '86f97177e959cb40229010b90f066fd602d6a06f':
  Report OTA time statistics

Change-Id: I271c156232c49a861579acd9ce90c91fbc7e5a4f
 2016-05-24 21:41:06 +00:00
Tianjie Xu
86f97177e9 Merge "Report OTA time statistics" into nyc-dev 2016-05-24 21:35:25 +00:00