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

209678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
2a5ac2e276 am a4bfc36c: (-s ours) am d5406749: am 176c878d: am fa37ee81: am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev 
* commit 'a4bfc36c558643ab25c5dae1622d9b476e5dc8b4':
  DO NOT MERGE: Don't backup night mode setting
 2015-07-29 22:05:23 +00:00
Adrian Roos
6086a25eb7 am 5334b265: am aeda904f: am 4371922d: am 8e9b33f8: am 726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev 
* commit '5334b265af71a31b0cf428b97b437ac040c067dc':
  Fix and deprecate lock pattern related settings
 2015-07-29 22:05:15 +00:00
Alan Viverette
e013384386 am 1a9097b5: am d02e90f2: am 5466d754: am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 
* commit '1a9097b5695759aa1e9e8fea563a7a569c0b345f':
  Ensure maxHeight is at least 0 during measureChildHorizontal()
 2015-07-29 22:05:04 +00:00
Alan Viverette
2c48d46d52 am f9ff3a27: am 91f23647: am 7fedf5d4: am 1c8107dd: am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 
* commit 'f9ff3a27c6e6cdea7a0f05024de22bc2bad9312a':
  Always distribute excess space in LinearLayout measurement
 2015-07-29 22:04:56 +00:00
Jeff Sharkey
dea786bf7c am fb4a3a99: am aa6c2002: am ca843039: am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev 
* commit 'fb4a3a99da3b28e1873feecb5c074aa537239dd6':
  Always return content Uri for downloads.
 2015-07-29 22:04:49 +00:00
Raph Levien
27630ec94d am bd0db6b4: am 8fde12eb: am c248a6cf: am d9074d1e: am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev 
* commit 'bd0db6b451fd3182fbc73157af4021b84e8177e8':
  Release text when finishing StaticLayout.Builder
 2015-07-29 22:04:40 +00:00
Wale Ogunwale
fa9a2f54c2 am 3f9fa52b: am d3399d04: am 7df4d8b0: am f8fa9f23: am 25782ef8: Merge "Added stack id to TaskRecord dump." into mnc-dev 
* commit '3f9fa52b59e112a1616d9da08c5c50c0ba46c688':
  Added stack id to TaskRecord dump.
 2015-07-29 22:04:14 +00:00
Roshan Pius
d1501fd046 am 231efff5: am bc25174b: am 51a193a3: am 5d573ed8: am 944b6362: Merge "Add a command to register SIM Phone account." into mnc-dev 
* commit '231efff579bac18bc8073558f97add44a2215842':
  Add a command to register SIM Phone account.
 2015-07-29 22:04:07 +00:00
Adrian Roos
bb8326d0cc am f03ad443: am f65209d8: am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev 
* commit 'f03ad4438323b866fc465e3f2a425c266cdacdf3':
  Fix pattern lock for accessibility
 2015-07-29 22:04:00 +00:00
Maurice Lam
0f4fa60233 am 8abee2a6: am 103e96c5: am 34f86392: am 4c927895: am 75d958c4: Merge "Disable launching assist during setup" into mnc-dev 
* commit '8abee2a698742045131baa9f561d36399b31b508':
  Disable launching assist during setup
 2015-07-29 22:03:51 +00:00
Christine Hallstrom
ae5345c841 am a0da644d: am f96965ae: am dbcb4e10: am 7d1d4af3: am a42e6816: Merge "Change NTP polling interval from 10 days to 24 hours." into mnc-dev 
* commit 'a0da644ddb73fe1e9b69a4dc72363e63761c8be7':
  Change NTP polling interval from 10 days to 24 hours.
 2015-07-29 22:03:35 +00:00
Geoff Mendal
57b7ae4910 am af3e2eb4: (-s ours) am b719afc1: (-s ours) am a88be530: (-s ours) am de399af7: (-s ours) am 3986360a: (-s ours) Import translations. DO NOT MERGE 
* commit 'af3e2eb49cb3aff145d6ec87e0bbf79bf4e2d175':
  Import translations. DO NOT MERGE
 2015-07-29 22:03:27 +00:00
Svetoslav Ganov
fdf59bf82f am c875ad14: am 56de6167: am f6c2d8a9: am 6da43a83: am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev 
* commit 'c875ad14ddc09d0d3a3bde58f71845123110f9f2':
  Remove dependencies on the package installer's package name
 2015-07-29 22:03:19 +00:00
Sailesh Nepal
6672c8ba3b am 33ec1710: am 2830a139: am 2084291d: am 33763760: am 6b96de8d: Merge "Default permissions for sim call manager" into mnc-dev 
* commit '33ec1710b0404f36019688ea8e285b687f81109c':
  Default permissions for sim call manager
 2015-07-29 22:03:03 +00:00
Svetoslav Ganov
d9af284299 am f8678e33: am 184f3c24: am 0acabb00: am 9e3d8e26: am a7a65ee4: Merge "Allow non system to set perm policy flags - needed by the installer" into mnc-dev 
* commit 'f8678e336f4326115c8635f24def9096f8cad1ca':
  Allow non system to set perm policy flags - needed by the installer
 2015-07-29 22:02:54 +00:00
Svetoslav Ganov
d2574c0768 am ef87e802: am 2e621fdc: am ff5e7c34: am 7b45b0fb: am 120a86ac: Merge "Do not reset runtime permissions on upgrade" into mnc-dev 
* commit 'ef87e802faac3a330681743fb3215dd3978dc268':
  Do not reset runtime permissions on upgrade
 2015-07-29 22:02:44 +00:00
Robert Greenwalt
771d210ab2 Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev 2015-07-29 22:00:40 +00:00
Svetoslav Ganov
393c7fb2c6 Merge "Default grants: handle update system packages" into mnc-dev 2015-07-29 21:54:13 +00:00
Adrian Roos
f03ad44383 am f65209d8: am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev 
* commit 'f65209d8082ca1251996021ddf0b227f0c08f56f':
  Fix pattern lock for accessibility
 2015-07-29 21:52:08 +00:00
Adrian Roos
f65209d808 am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev 
* commit 'e2cd84196e1266200f906b5d721640217fc2e6f9':
  Fix pattern lock for accessibility
 2015-07-29 21:37:08 +00:00
Elliott Hughes
9ec96f9756 Move frameworks/base/tools/ off AndroidConfig.h. 
Change-Id: Ibc7abb67a56945a9618bc91ccdbebe4c806879a5
 2015-07-29 14:35:18 -07:00
Steve McKay
5542d91998 Add a TestSuite for running unittests. 
Change-Id: If9777dd23d3a4cb2969e2709f98806417e412c5d
 2015-07-29 14:34:57 -07:00
Alan Viverette
a4bfc36c55 am d5406749: am 176c878d: am fa37ee81: am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev 
* commit 'd54067499371ffb007d006344bd95497d1497c6f':
  DO NOT MERGE: Don't backup night mode setting
 2015-07-29 21:34:50 +00:00
Adrian Roos
5334b265af am aeda904f: am 4371922d: am 8e9b33f8: am 726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev 
* commit 'aeda904f55e43b37b0783f4ef2d1a183e3d778db':
  Fix and deprecate lock pattern related settings
 2015-07-29 21:34:44 +00:00
Adrian Roos
e2cd84196e Merge "Fix pattern lock for accessibility" into mnc-dev 2015-07-29 21:23:25 +00:00
Alan Viverette
d540674993 am 176c878d: am fa37ee81: am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev 
* commit '176c878d8af4d6f610e77bd32d788c7d68cfbf3f':
  DO NOT MERGE: Don't backup night mode setting
 2015-07-29 21:22:52 +00:00
Adrian Roos
aeda904f55 am 4371922d: am 8e9b33f8: am 726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev 
* commit '4371922d13794726d5fb6917b6db07c13e6d7ae2':
  Fix and deprecate lock pattern related settings
 2015-07-29 21:22:39 +00:00
Adrian Roos
d2def94639 Fix pattern lock for accessibility 
- remove the content description in Keyguard
- only show virtual views when pattern is in progress
- add a content description when the pattern is not in progress

Bug: 22646748
Change-Id: Id32a37c4c74c82b547cee8861b2856fa0a08c41c
 2015-07-29 14:13:53 -07:00
Alan Viverette
176c878d8a am fa37ee81: am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev 
* commit 'fa37ee81ed80f0dc6eeeed2d9a89610dd967229a':
  DO NOT MERGE: Don't backup night mode setting
 2015-07-29 21:11:59 +00:00
Adrian Roos
4371922d13 am 8e9b33f8: am 726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev 
* commit '8e9b33f8fde3d96a7ced9817ce9357da4f1a7cff':
  Fix and deprecate lock pattern related settings
 2015-07-29 21:11:55 +00:00
Robert Greenwalt
374d91df94 Revert "DO NOT MERGE Enhance local log." 
This reverts commit dd6f8441292d30cc51c1e32bb27fab8dfb791f90.

bug:22632129
Change-Id: Ibd4b9c35b66cb7d877085bc010fde45a682ba34f
 2015-07-29 14:11:23 -07:00
Svetoslav
4aa9797786 Default grants: handle update system packages 
If there is an app on the system image that gets default
grants but it is updated with a version that does not use
all permissions the version on the system image does, we
would wrongly try to grant a permission to the updated app
that it does not request and crash as a result. Now we
default grant permission that are requested by the system
version of the app regardless if it is updated but only if
the system app is not updated or the update also uses these
permissions.

bug:22800767

Change-Id: Ic22b62ba4976367420a56bdadc8e3824b0b9104f
 2015-07-29 14:00:30 -07:00
Alan Viverette
fa37ee81ed am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev 
* commit '93184eef410da6bb958d22e1dc90f3fddabc9369':
  DO NOT MERGE: Don't backup night mode setting
 2015-07-29 20:58:38 +00:00
Adrian Roos
8e9b33f8fd am 726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev 
* commit '726d47b7716807f740ceea6ea71c46b20ecb8ba7':
  Fix and deprecate lock pattern related settings
 2015-07-29 20:58:32 +00:00
Alan Viverette
1a9097b569 am d02e90f2: am 5466d754: am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 
* commit 'd02e90f2c3917a983ed7f543efa30c05a34ee3ea':
  Ensure maxHeight is at least 0 during measureChildHorizontal()
 2015-07-29 20:55:07 +00:00
Alan Viverette
f9ff3a27c6 am 91f23647: am 7fedf5d4: am 1c8107dd: am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 
* commit '91f2364738666674ad9dda7bc633d22ad5fb8680':
  Always distribute excess space in LinearLayout measurement
 2015-07-29 20:55:01 +00:00
Jeff Sharkey
fb4a3a99da am aa6c2002: am ca843039: am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev 
* commit 'aa6c200281e35a1d8b566c307c8b1620916c4391':
  Always return content Uri for downloads.
 2015-07-29 20:54:53 +00:00
Alan Viverette
93184eef41 Merge "DO NOT MERGE: Don't backup night mode setting" into mnc-dev 2015-07-29 20:46:08 +00:00
Alan Viverette
d02e90f2c3 am 5466d754: am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 
* commit '5466d7548e32afecfda10aaeee05b89cdc3950e2':
  Ensure maxHeight is at least 0 during measureChildHorizontal()
 2015-07-29 20:41:43 +00:00
Alan Viverette
91f2364738 am 7fedf5d4: am 1c8107dd: am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 
* commit '7fedf5d4690fdb84283ac91703ee7aee34ab9049':
  Always distribute excess space in LinearLayout measurement
 2015-07-29 20:41:35 +00:00
Jeff Sharkey
aa6c200281 am ca843039: am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev 
* commit 'ca843039278305a3610bd459bf971dd2a1879d27':
  Always return content Uri for downloads.
 2015-07-29 20:41:26 +00:00
Raph Levien
bd0db6b451 am 8fde12eb: am c248a6cf: am d9074d1e: am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev 
* commit '8fde12eb447c4f7a7db17977ffc00fec42fe5bc9':
  Release text when finishing StaticLayout.Builder
 2015-07-29 20:40:47 +00:00
Adrian Roos
726d47b771 Merge "Fix and deprecate lock pattern related settings" into mnc-dev 2015-07-29 20:39:27 +00:00
Ji Yang
216813c9e1 Add API to let carrier app send SMS without auto perisisting. 
Bug: 22773702
Change-Id: I976a8268ce95fe9fc5bb046ce744a1cddefc8eeb
 2015-07-29 13:30:55 -07:00
Alan Viverette
5466d7548e am 4c06870d: am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 
* commit '4c06870db615acbf50008e0bc964e15a1c36aa22':
  Ensure maxHeight is at least 0 during measureChildHorizontal()
 2015-07-29 20:26:33 +00:00
Alan Viverette
7fedf5d469 am 1c8107dd: am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 
* commit '1c8107dd89c8424c8fad9e341dc43be04e1a62ae':
  Always distribute excess space in LinearLayout measurement
 2015-07-29 20:26:28 +00:00
Jeff Sharkey
ca84303927 am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev 
* commit '439e2db3f38f0d304757651b2d9291ba1c93f2d2':
  Always return content Uri for downloads.
 2015-07-29 20:26:21 +00:00
Raph Levien
8fde12eb44 am c248a6cf: am d9074d1e: am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev 
* commit 'c248a6cf3441e0dcb50f041e297a93116604990e':
  Release text when finishing StaticLayout.Builder
 2015-07-29 20:25:40 +00:00
Alan Viverette
ec9bea7eeb DO NOT MERGE: Don't backup night mode setting 
Bug: 22824325
Change-Id: I7a244f416e1aa258735eea09858e3c202e8c8945
 2015-07-29 16:22:03 -04:00
Vadim Tryshev
d0432b2db4 Merge "Adding a drag flag to make drag shadow opaque." 2015-07-29 20:11:48 +00:00