Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,239 Commits 3 Branches 0 Tags
124eb8dc36ff6f6a33b9e40a402808da7ecf487c
Commit Graph

49629 Commits

Author SHA1 Message Date
Simranjit Kohli
b6af87ca90 am e5bf7064: am 964a4121: Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev 
* commit 'e5bf70649499b3d3404d5df156ad38f106ce158a':
  [Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it.
 2015-07-30 17:24:43 +00:00
Alan Viverette
82c14e6865 am 92360585: am 559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev 
* commit '92360585abfb96736f5b55b5410425eb4ad7669c':
  Include non-zero dimension views in excess space calculation
 2015-07-30 17:18:44 +00:00
Simranjit Kohli
e5bf706494 am 964a4121: Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev 
* commit '964a41214d19f00e8420500ccaa29e0902933c7e':
  [Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it.
 2015-07-30 17:17:49 +00:00
Alan Viverette
92360585ab am 559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev 
* commit '559daf7a749514065c6c482503a86a528addc985':
  Include non-zero dimension views in excess space calculation
 2015-07-30 17:11:58 +00:00
Simranjit Kohli
964a41214d Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev 2015-07-30 17:09:44 +00:00
Alan Viverette
559daf7a74 Merge "Include non-zero dimension views in excess space calculation" into mnc-dev 2015-07-30 17:02:45 +00:00
Dan Sandler
06e544f0be am a93ed128: am 7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext. 
* commit 'a93ed1288176e7f4789923f361e798bce6ef1618':
  DateTimeView: don't assume you have an ApplicationContext.
 2015-07-30 16:54:03 +00:00
Dan Sandler
a93ed12881 am 7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext. 
* commit '7bd8e6a8f2d0d200fd9a74b55469492cc02de6a4':
  DateTimeView: don't assume you have an ApplicationContext.
 2015-07-30 16:45:51 +00:00
Dan Sandler
7bd8e6a8f2 DateTimeView: don't assume you have an ApplicationContext. 
Bug: 22840771
Change-Id: I3be6369936f90e9ce4e61a59ea81b0d3408a0f99
 2015-07-30 11:59:30 -04:00
Alan Viverette
da2f304409 Include non-zero dimension views in excess space calculation 
Bug: 22840778
Change-Id: Iba44c59bbaa48f63b26f342e0510b4c421e8748b
 2015-07-30 11:44:12 -04:00
Daniel Sandler
829359163d am 033fe243: am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev 
* commit '033fe243a75f6e5e7ba8f75bd829bddaf213c7c2':
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 03:25:12 +00:00
Daniel Sandler
033fe243a7 am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev 
* commit 'bbe1682b1652c37b66609676e5829517279ff141':
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 03:15:17 +00:00
Daniel Sandler
bbe1682b16 Merge changes from topic 'fix-media-notifications' into mnc-dev 
* changes:
  Fully support Icons in Notification actions.
  Fix media notification action icons.
 2015-07-30 02:57:06 +00:00
Simranjit Singh Kohli
210baceaa1 [Improve docs for AccountManager] 
Currently, the docs for AccountManager are somewhat misleading and may
cause developer errors. To avoid them, we are properly documenting it.

Bug: 21924096
Change-Id: If775a54a09219b0f1623d2ff903085b9d12aa863
 2015-07-29 19:43:16 -07:00
Paul Jensen
9a2314b0bc am 682fd6ae: am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev 
* commit '682fd6aedea87e345f033b489ef9f6008bd19c30':
  Fix missing onLost NetworkCallbacks when network loses capability
 2015-07-30 02:36:45 +00:00
Paul Jensen
682fd6aede am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev 
* commit 'a991c66c12da30d0240ac6c98736edee93d95977':
  Fix missing onLost NetworkCallbacks when network loses capability
 2015-07-30 02:20:49 +00:00
Paul Jensen
a991c66c12 Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev 2015-07-30 02:10:50 +00:00
Dianne Hackborn
17043db8e9 am 69e7fa8a: am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev 
* commit '69e7fa8a521a402b4a80aafbca203f66b3323123':
  More maybe fix issue #22765972: Binder transactions running out...
 2015-07-30 02:00:35 +00:00
Dianne Hackborn
69e7fa8a52 am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev 
* commit '8d3a67a8d475b43cbac50a2a186a19f4a29c7892':
  More maybe fix issue #22765972: Binder transactions running out...
 2015-07-30 01:44:38 +00:00
Dianne Hackborn
8d3a67a8d4 Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev 2015-07-30 01:32:09 +00:00
Dianne Hackborn
6b42bc0e21 More maybe fix issue #22765972: Binder transactions running out... 
...of address space causing package manager to fail

Make sure to flush binder commands when done with an async task.

Change-Id: I9f171add7051587ab854226b97a12c7e1844ad5d
 2015-07-29 17:58:33 -07:00
Billy Lau
be6bfb4c91 am 83749ac9: am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev 
* commit '83749ac948c40a3c302f00bef47ef0b4bba96ae7':
  Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
 2015-07-29 23:02:05 +00:00
Dan Sandler
2391e3262e am d796a728: am 25ffc7ad: Accessibility: Read the time correctly in quick settings. 
* commit 'd796a728bc7c1ffa3af53ef040e46401dce667f5':
  Accessibility: Read the time correctly in quick settings.
 2015-07-29 22:47:29 +00:00
Billy Lau
83749ac948 am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev 
* commit 'a6706627a9bf749cc591605272810e03983a9eea':
  Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)
 2015-07-29 22:46:20 +00:00
Billy Lau
a6706627a9 Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev 2015-07-29 22:42:27 +00:00
Dan Sandler
d796a728bc am 25ffc7ad: Accessibility: Read the time correctly in quick settings. 
* commit '25ffc7ad950d9b2857abe9cb66ed53aed7a18ecf':
  Accessibility: Read the time correctly in quick settings.
 2015-07-29 22:32:15 +00:00
Billy Lau
6ad2d66072 Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check 
changes)

AppOpsManager:
Changed the default operating mode for WRITE_SETTINGS to MODE_DEFAULT from
MODE_ALLOWED.

packages/SettingsProvider:
We no longer do static permission checks for WRITE_SETTINGS in early checks and
defer that to app op when MODE_DEFAULT is returned. For some operations,
checking against WRITE_SECURE_SETTINGS is sufficient.

ActivityManagerService & PowerManagerService:
Incorporated app op checks and handled the MODE_DEFAULT case.

provider/Settings:
Added helper function to do checks on whether app ops protected operations
can be performed by a caller. This includes checks for WRITE_SETTINGS and
SYSTEM_ALERT_WINDOW.
Also added a public API (with javadocs) for apps to query if they can modify
system settings.
Changed the javadocs description for ACTION_MANAGE_WRITE_SETTINGS and
ACTION_MANAGE_OVERLAY_PERMISSION.
Added public API (with javadocs) for apps to query whether they can draw overlays or not,
and also javadocs description on how to use that check.

Change-Id: I7b651fe8af836c2074defdbd6acfec3f32acdbe9
 2015-07-29 23:21:26 +01:00
Robert Greenwalt
4799a9e06e am f8808db0: am 771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev 
* commit 'f8808db0c107c748ba84b097c97de13ec33fd8fa':
  Revert "DO NOT MERGE Enhance local log."
 2015-07-29 22:21:13 +00:00
Dan Sandler
25ffc7ad95 Accessibility: Read the time correctly in quick settings. 
The problem is that, for 12-hour locales, we cut the "a"
part of the time format out to show it in a separate
TextView so it can be animated independently of the actual
time. Unfortunately, while TTS is smart enough to pronounce
"1:15 AM" as /wʌn fɪftin eɪ ɛm/, "AM" on its own looks like
the English word "am" and is pronounced /æm/.

To fix this, a TextClock must be able to accept separate
formats for its content description than its presentation.
With this capability we can place the complete 12-hour time
format (including am/pm) in one of the views and suppress
the other one, so that the utterance creates an identical
experience to visual inspection: "1:15 AM" for all users.

Bug: 21718000
Change-Id: Ic9920d71ae4d4ad41ba86d7bd96f9a19b07e2108
 2015-07-29 22:19:52 +00:00
Robert Greenwalt
f8808db0c1 am 771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev 
* commit '771d210ab2d0df9d6748eb56e3f7250377df1fc4':
  Revert "DO NOT MERGE Enhance local log."
 2015-07-29 22:08:15 +00:00
Robert Greenwalt
771d210ab2 Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev 2015-07-29 22:00:40 +00: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 dd6f844129.

bug:22632129
Change-Id: Ibd4b9c35b66cb7d877085bc010fde45a682ba34f
 2015-07-29 14:11:23 -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
93184eef41 Merge "DO NOT MERGE: Don't backup night mode setting" into mnc-dev 2015-07-29 20:46:08 +00:00
Adrian Roos
726d47b771 Merge "Fix and deprecate lock pattern related settings" into mnc-dev 2015-07-29 20:39:27 +00: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
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
Raph Levien
c248a6cf34 am d9074d1e: am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev 
* commit 'd9074d1eec5be644168dc17133f5bd753fedb614':
  Release text when finishing StaticLayout.Builder
 2015-07-29 20:11:20 +00:00
Alan Viverette
4c06870db6 am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 
* commit '47a74e7e2b45d9ec462f47f6741c381c478b4156':
  Ensure maxHeight is at least 0 during measureChildHorizontal()
 2015-07-29 20:10:21 +00:00
Alan Viverette
1c8107dd89 am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 
* commit '5c380efa2c0bf3617aedbb9270fa02cce59c7935':
  Always distribute excess space in LinearLayout measurement
 2015-07-29 20:10:16 +00:00
Jeff Sharkey
439e2db3f3 am b86048da: Merge "Always return content Uri for downloads." into mnc-dev 
* commit 'b86048dab3df3e4a8f05de170b38c189243de898':
  Always return content Uri for downloads.
 2015-07-29 20:10:09 +00:00
Alan Viverette
47a74e7e2b Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev 2015-07-29 20:02:41 +00:00
Alan Viverette
5c380efa2c Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev 2015-07-29 20:01:52 +00:00
Jeff Sharkey
b86048dab3 Merge "Always return content Uri for downloads." into mnc-dev 2015-07-29 19:59:36 +00:00
Raph Levien
d9074d1eec am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev 
* commit 'c3cc344d12ff4a952af8842fab71ef2f6df5e340':
  Release text when finishing StaticLayout.Builder
 2015-07-29 19:58:30 +00:00