drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,801 Commits 1 Branch 0 Tags
Commit Graph

202801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
2cd92043c7 am d1087e74: am 5b65be96: am 370c27c7: am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev 
* commit 'd1087e74ad38c0918f325775873330110e497eea':
  Qualify the uid with the userId when granting permissions
 2015-07-09 01:14:27 +00:00
Amith Yamasani
d1087e74ad am 5b65be96: am 370c27c7: am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev 
* commit '5b65be96ab061cbdba479795ff467c0eab92c28a':
  Qualify the uid with the userId when granting permissions
 2015-07-09 01:03:43 +00:00
Wale Ogunwale
5ce1fac0d1 am a7bdd2f9: am 569a271f: am 1fee5522: am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 
* commit 'a7bdd2f9ed41c6a12d26cdaf4cc4e5bcb32420b4':
  Finish already paused activity if it should be finished after pausing
 2015-07-09 00:54:47 +00:00
Amith Yamasani
5b65be96ab am 370c27c7: am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev 
* commit '370c27c7fe308e351d375295d422df76f7ede164':
  Qualify the uid with the userId when granting permissions
 2015-07-09 00:47:08 +00:00
Filip Gruszczynski
93c4f91594 am c72a5821: am 886fd2f5: am b010291a: Fix NPE when requesting outsets for detached view. 
* commit 'c72a582138c1db297c662e5f83ce6a2e97f8bf69':
  Fix NPE when requesting outsets for detached view.
 2015-07-09 00:45:37 +00:00
Wale Ogunwale
a7bdd2f9ed am 569a271f: am 1fee5522: am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 
* commit '569a271f0c32a66b33f305e5181c7687b6303aa5':
  Finish already paused activity if it should be finished after pausing
 2015-07-09 00:41:25 +00:00
Amith Yamasani
370c27c7fe am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev 
* commit '705ba9606325df6575d171ee96811d215e69b4e8':
  Qualify the uid with the userId when granting permissions
 2015-07-09 00:37:37 +00:00
Filip Gruszczynski
c72a582138 am 886fd2f5: am b010291a: Fix NPE when requesting outsets for detached view. 
* commit '886fd2f5a05a5e36ac20f95c1c06e1716a52c8e9':
  Fix NPE when requesting outsets for detached view.
 2015-07-09 00:33:04 +00:00
Wale Ogunwale
569a271f0c am 1fee5522: am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 
* commit '1fee5522b60d9c24c9b30b5c995e72df191f7d50':
  Finish already paused activity if it should be finished after pausing
 2015-07-09 00:30:17 +00:00
Filip Gruszczynski
886fd2f5a0 am b010291a: Fix NPE when requesting outsets for detached view. 
* commit 'b010291ace13947fcc76b1a64eaa67880e15f0a6':
  Fix NPE when requesting outsets for detached view.
 2015-07-09 00:15:25 +00:00
Jeff Sharkey
1c1f53fc83 am 29b37961: am 4b7178e6: am 435c4013: am 9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-dev 
* commit '29b37961d30320a67c3edeaf800a76099403b022':
  Fix crash looping SystemUI.
 2015-07-09 00:08:01 +00:00
Selim Cinek
0274229eae am 1f7ec848: am 52b2821a: am 02f91c02: am 9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev 
* commit '1f7ec84855407c0f884ee1c668164be299ec3a5f':
  Cleaned up the clipping logic for the dismiss motion.
 2015-07-09 00:07:55 +00:00
Jeff Sharkey
29b37961d3 am 4b7178e6: am 435c4013: am 9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-dev 
* commit '4b7178e6499dbc7ee52647089b344d539a868157':
  Fix crash looping SystemUI.
 2015-07-08 23:53:31 +00:00
Ian Pedowitz
fca383247b am 899b271a: am 6d32062d: am baad8d36: am 224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev 
* commit '899b271a47776bbe4499d687d1a774e3f887891c':
  com.android.mms is no more, so removing from default_sms_application
 2015-07-08 23:53:28 +00:00
Selim Cinek
1f7ec84855 am 52b2821a: am 02f91c02: am 9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev 
* commit '52b2821a80830d793c327c4952e5ce570f61de47':
  Cleaned up the clipping logic for the dismiss motion.
 2015-07-08 23:53:24 +00:00
Sasha Levitskiy
6889cc64cd am 70407ff4: am 1022fa9a: am ce3da983: am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev 
* commit '70407ff418d54cbcd62f59334c258f4781994b20':
  Fingerprint: Add post enroll interface.
 2015-07-08 23:53:20 +00:00
Jim Miller
f0c9d6f18e am d1e3456b: am 215763fb: am cd065639: am e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev 
* commit 'd1e3456b2e80b1c443ccd2764d240c1c46a1f7d0':
  Don't use fingerId when creating names
 2015-07-08 23:53:14 +00:00
Vineeta Srivastava
c51e24699a am 1f466891: am 0ad550be: am 3af271a9: am 99b8820f: Use fingerid 0 when checking failed attempts. 
* commit '1f46689175558c2e5accfaf5d1375007d6a49edc':
  Use fingerid 0 when checking failed attempts.
 2015-07-08 23:53:10 +00:00
Wale Ogunwale
1fee5522b6 am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 
* commit 'dad62b9f993b95bb9a0c20d29c69d35bd7531008':
  Finish already paused activity if it should be finished after pausing
 2015-07-08 23:45:36 +00:00
Amith Yamasani
705ba96063 Merge "Qualify the uid with the userId when granting permissions" into mnc-dev 2015-07-08 23:44:55 +00:00
Jeff Sharkey
4b7178e649 am 435c4013: am 9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-dev 
* commit '435c4013f5c26d380dbb3360c3958b37796ff3c1':
  Fix crash looping SystemUI.
 2015-07-08 23:39:14 +00:00
Selim Cinek
52b2821a80 am 02f91c02: am 9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev 
* commit '02f91c024e67eb408aee9e84f133290cf732d5a1':
  Cleaned up the clipping logic for the dismiss motion.
 2015-07-08 23:39:10 +00:00
Ian Pedowitz
899b271a47 am 6d32062d: am baad8d36: am 224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev 
* commit '6d32062d9de7fc306a0d8733de7c8dd63597b018':
  com.android.mms is no more, so removing from default_sms_application
 2015-07-08 23:38:17 +00:00
Sasha Levitskiy
70407ff418 am 1022fa9a: am ce3da983: am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev 
* commit '1022fa9a51b08278250cc44b065fae115137b087':
  Fingerprint: Add post enroll interface.
 2015-07-08 23:38:08 +00:00
Jim Miller
d1e3456b2e am 215763fb: am cd065639: am e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev 
* commit '215763fb001b4b9464d27dd1b9b63eff04b4996f':
  Don't use fingerId when creating names
 2015-07-08 23:38:02 +00:00
Vineeta Srivastava
1f46689175 am 0ad550be: am 3af271a9: am 99b8820f: Use fingerid 0 when checking failed attempts. 
* commit '0ad550be274ba61e64bd7e5382c2fd4c2e60b719':
  Use fingerid 0 when checking failed attempts.
 2015-07-08 23:37:56 +00:00
Wale Ogunwale
dad62b9f99 Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev 2015-07-08 23:34:31 +00:00
Jeff Sharkey
435c4013f5 am 9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-dev 
* commit '9f4c4ee66632e1355afa1218021ed728a99f7415':
  Fix crash looping SystemUI.
 2015-07-08 23:23:48 +00:00
Selim Cinek
02f91c024e am 9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev 
* commit '9201385f2e59d58bc52a5fbe5a3b666850dcae5f':
  Cleaned up the clipping logic for the dismiss motion.
 2015-07-08 23:23:44 +00:00
Ian Pedowitz
6d32062d9d am baad8d36: am 224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev 
* commit 'baad8d36a1f4e2edf9d55d55c73c4a5cdd04c0cd':
  com.android.mms is no more, so removing from default_sms_application
 2015-07-08 23:23:12 +00:00
Sasha Levitskiy
1022fa9a51 am ce3da983: am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev 
* commit 'ce3da9839cbb905c8e6aaf38d74fc7ad719ae105':
  Fingerprint: Add post enroll interface.
 2015-07-08 23:23:09 +00:00
Jim Miller
215763fb00 am cd065639: am e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev 
* commit 'cd065639aebeb34219dfce1fd6ef26ba39af0fd4':
  Don't use fingerId when creating names
 2015-07-08 23:23:05 +00:00
Vineeta Srivastava
0ad550be27 am 3af271a9: am 99b8820f: Use fingerid 0 when checking failed attempts. 
* commit '3af271a957a6da325b6f33c19270df2af1f207a8':
  Use fingerid 0 when checking failed attempts.
 2015-07-08 23:23:01 +00:00
Filip Gruszczynski
b010291ace Fix NPE when requesting outsets for detached view. 
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
(cherry picked from commit e660d4e96a2e5ac35f2dd6e2b43c588dd7e28358)
 2015-07-08 23:22:36 +00:00
Jeff Sharkey
9f4c4ee666 Merge "Fix crash looping SystemUI." into mnc-dev 2015-07-08 23:14:11 +00:00
Jeff Sharkey
a80d264be6 Fix crash looping SystemUI. 
Bug: 22358954
Change-Id: Ie8539d7f866ae722edd071f6b20e8f8881d82434
 2015-07-08 16:11:55 -07:00
Ian Pedowitz
baad8d36a1 am 224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev 
* commit '224f0369ca2ab6265379ce170c8779a7385a33f3':
  com.android.mms is no more, so removing from default_sms_application
 2015-07-08 23:10:53 +00:00
Sasha Levitskiy
ce3da9839c am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev 
* commit '12328ef422027f2f5f033ed65c8a09535f9ca81d':
  Fingerprint: Add post enroll interface.
 2015-07-08 23:10:49 +00:00
Jim Miller
cd065639ae am e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev 
* commit 'e6fd76c23591c90cc8f8ae64d323e22abf491fdf':
  Don't use fingerId when creating names
 2015-07-08 23:10:42 +00:00
Vineeta Srivastava
3af271a957 am 99b8820f: Use fingerid 0 when checking failed attempts. 
* commit '99b8820fd7357f6287e65468b23751279562807b':
  Use fingerid 0 when checking failed attempts.
 2015-07-08 23:10:38 +00:00
Selim Cinek
9201385f2e Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev 2015-07-08 23:08:48 +00:00
Ian Pedowitz
224f0369ca Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev 2015-07-08 23:01:19 +00:00
Ian Pedowitz
de8d3a53a8 com.android.mms is no more, so removing from default_sms_application 
Fixing a minor comment typo

Bug: 22333078
Change-Id: Id2df5805567967fcf5544dca0264e130b46b4858
 2015-07-08 23:00:22 +00:00
Sasha Levitskiy
12328ef422 Merge "Fingerprint: Add post enroll interface." into mnc-dev 2015-07-08 22:59:51 +00:00
Jim Miller
e6fd76c235 Merge "Don't use fingerId when creating names" into mnc-dev 2015-07-08 22:58:23 +00:00
Amith Yamasani
6b53c16210 Qualify the uid with the userId when granting permissions 
Calls to remountUid() for secondary users was not using the
correct uid. This would prevent providing the required
storage permissions to default apps.

Discovered when investigating bug: 22356546

Change-Id: I98c8f6da724e46331c1c90b95969ca0871ef4fe9
 2015-07-08 15:57:24 -07:00
Roshan Pius
02b223f07f am f4ca7f98: am 32aeade4: am f08a7ada: am 8f596907: Merge "Change sequence of call removal from Phone\'s db." into mnc-dev 
* commit 'f4ca7f9895b7f464734f83890f726a07c1d133eb':
  Change sequence of call removal from Phone's db.
 2015-07-08 22:44:35 +00:00
Jorim Jaggi
a7c4e5c382 am acfff97c: am 91a4079f: am b0ca5026: am 6d712e06: Remove volume motion delay 
* commit 'acfff97c3c5634502b7e75b28cffbaabee922719':
  Remove volume motion delay
 2015-07-08 22:44:29 +00:00
Jeff Sharkey
b64813bdf0 am 093be69c: am f3d73162: am 46552cff: am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev 
* commit '093be69c4168988938d276d31625515f641a170b':
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
 2015-07-08 22:44:24 +00:00
Jeff Sharkey
608114f966 am e232afca: am 95661575: am 612aac4e: am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev 
* commit 'e232afca8240e3b8bbbd9696a210aed5b14b9b79':
  Generate stable MTP storage IDs.
 2015-07-08 22:44:19 +00:00