Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,979 Commits 3 Branches 0 Tags
3c111b523262c1e00ca59423fbcd1abbe6ab974b
Commit Graph

197979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oren Blasberg
3c111b5232 am 79362baf: am 84f8a096: Merge "Make "dismiss all" button keyboard accessible." into mnc-dev 
* commit '79362baf5f5a1edb4ff07814ed5c85c72e79fd38':
  Make "dismiss all" button keyboard accessible.
 2015-07-16 00:57:46 +00:00
Adrian Roos
8468ffce5a am b8550d30: am fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev 
* commit 'b8550d3036fdf49eeb551ad1e1c9d1a9d06398e2':
  Fix wrong tint mode on airplane and vpn icons
 2015-07-16 00:42:49 +00:00
Christopher Tate
49af7ad480 am fbb4e9d2: am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev 
* commit 'fbb4e9d23f0d3e3a220e0e3e63934409d615f50c':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-16 00:42:45 +00:00
Oren Blasberg
79362baf5f am 84f8a096: Merge "Make "dismiss all" button keyboard accessible." into mnc-dev 
* commit '84f8a0969322b2d5f40ea1eac0db9996e1876138':
  Make "dismiss all" button keyboard accessible.
 2015-07-16 00:41:31 +00:00
Billy Lau
fa2584f6f5 am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 
* commit 'da93454bfa7c46ba5607c74252c458b48a473e9d':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
 2015-07-16 00:31:35 +00:00
Adrian Roos
b8550d3036 am fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev 
* commit 'fc8e923d5e551862fe1abaac2256925d6955ca07':
  Fix wrong tint mode on airplane and vpn icons
 2015-07-16 00:31:23 +00:00
Christopher Tate
fbb4e9d23f am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev 
* commit '3b1f8607fdc416a87e608499698719f3234ecc90':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-16 00:31:18 +00:00
Oren Blasberg
84f8a09693 Merge "Make "dismiss all" button keyboard accessible." into mnc-dev 2015-07-16 00:29:35 +00:00
Adrian Roos
fc8e923d5e Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev 2015-07-16 00:27:50 +00:00
Billy Lau
da93454bfa am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 
* commit '008409a2ea1feed095d53ce51429e4fed964c50c':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
 2015-07-16 00:21:44 +00:00
Christopher Tate
3b1f8607fd Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev 2015-07-16 00:21:12 +00:00
Billy Lau
008409a2ea Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 2015-07-16 00:04:35 +00:00
Christopher Tate
ac15b1b0c0 Intent filters need CATEGORY_BROWSABLE to be app-linking eligible 
Bug 22504009

Change-Id: I565b2ba4d1e5deeee8ede3363819deec206dbf58
 2015-07-15 16:56:58 -07:00
Dianne Hackborn
f9aa4b4d35 am 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 
* commit '309f9d6e7f777483f7ede3f8c7bd99ffd4794967':
  Implement issue #22403908: Enable assistant to refuse context sharing
 2015-07-15 23:51:54 +00:00
Dianne Hackborn
b5c44f904c am 709d013f: am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev 
* commit '709d013fd6571f0dcae3d3fc6e3be4be1e0787f1':
  Fix issue #22487155: Device unresponsive (deadlock in system_server)
 2015-07-15 23:51:50 +00:00
Dianne Hackborn
178d35d48a am fc569640: am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev 
* commit 'fc5696404b88035aa9197faeb2ee0bdca284ca76':
  Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...
 2015-07-15 23:51:45 +00:00
Dianne Hackborn
ae460ebfa7 am b3e37b3b: am c1a49b50: Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev 
* commit 'b3e37b3b07ab5923143470bd536922fa525a72cc':
  Fix issue #22479881: Nexus 6 randomly rebooting every few hours with...
 2015-07-15 23:51:39 +00:00
Dianne Hackborn
e12c549b7a am 0d04da1f: am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 
* commit '0d04da1fb71960c79820bb04cb65c7c41125fcee':
  Fix issue #22124996: VI: Command Request not Active
 2015-07-15 23:51:34 +00:00
Jim Miller
baa370e16b am db19e1de: Merge "Fix the build" into mnc-dr-dev 
* commit 'db19e1ded0d9bec62e798c6ba7677eefa4ff7c64':
  Fix the build
 2015-07-15 23:51:29 +00:00
Dianne Hackborn
309f9d6e7f am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 
* commit 'f6586cbde7d4612963eb2e8a2413235630676b83':
  Implement issue #22403908: Enable assistant to refuse context sharing
 2015-07-15 23:39:32 +00:00
Dianne Hackborn
709d013fd6 am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev 
* commit '67e02e60ca58db95b397fde7bfeeebb012e8aff8':
  Fix issue #22487155: Device unresponsive (deadlock in system_server)
 2015-07-15 23:39:27 +00:00
Dianne Hackborn
fc5696404b am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev 
* commit 'c4e2bcd4dca0401ca38a45dce04d29b92231d677':
  Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...
 2015-07-15 23:39:20 +00:00
Dianne Hackborn
b3e37b3b07 am c1a49b50: Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev 
* commit 'c1a49b50bf7638484d32ed6dbf863546a47f0e50':
  Fix issue #22479881: Nexus 6 randomly rebooting every few hours with...
 2015-07-15 23:39:16 +00:00
Dianne Hackborn
0d04da1fb7 am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 
* commit '1cf8b0b6bfbbf867512fcd7bbb4763692821ed36':
  Fix issue #22124996: VI: Command Request not Active
 2015-07-15 23:39:12 +00:00
Billy Lau
060275ffc7 Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW... 
AppOpsManager:
Changed the default mode for SYSTEM_ALERT_WINDOW to MODE_DEFAULT instead of
MODE_ALLOWED. Otherwise, an app that did not declare for this permission will
actually be allowed to perform OP_SYSTEM_ALERT_WINDOW, which is undesirable.
This change also allows callers to make their own decision based on the
current policy (M vs pre-M apps).

policy/PhoneWindowManager:
Added additional checks that will handle MODE_DEFAULT - this happens when an app
is newly installed but not yet configured.

wm/WindowManagerService:
Enriched some checks to include the treatment of MODE_DEFAULT - this will allow
pre-M apps uninterupted capability to draw on top of other apps.

Change-Id: I8de77730e158c97587427820cfba721bd5607bea
 2015-07-16 00:34:26 +01:00
Jim Miller
db19e1ded0 Merge "Fix the build" into mnc-dr-dev 2015-07-15 23:32:39 +00:00
Dianne Hackborn
f6586cbde7 Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 2015-07-15 23:31:25 +00:00
Dianne Hackborn
67e02e60ca Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev 2015-07-15 23:31:02 +00:00
Dianne Hackborn
c4e2bcd4dc Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev 2015-07-15 23:30:19 +00:00
Svetoslav
1f1f0cee10 am eb16e1fb: am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev 
* commit 'eb16e1fb2225f2cf84f5c56242a187fba59e39f8':
  Make sure we get valid package name or fail.
 2015-07-15 23:30:09 +00:00
Dianne Hackborn
c1a49b50bf Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev 2015-07-15 23:30:09 +00:00
Christopher Tate
ec0ed98da8 am b6b97e90: am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev 
* commit 'b6b97e90cb247560b880ae7269b5bfb1daa7aeef':
  Resolve based on the correct user's default browser
 2015-07-15 23:30:05 +00:00
Dianne Hackborn
1cf8b0b6bf Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 2015-07-15 23:29:56 +00:00
Jim Miller
de5b573e2a Fix the build 
Build broken due to a bad merge.

Change-Id: Id10b3db5d1bde2a2c9e8995e35b4fc58c5468544
 2015-07-15 16:29:30 -07:00
Svetoslav
eb16e1fb22 am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev 
* commit '08dda27be4678f2ab5bdc7e210d511ec105c158c':
  Make sure we get valid package name or fail.
 2015-07-15 23:13:03 +00:00
Christopher Tate
b6b97e90cb am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev 
* commit '06476508c4aae6b9bb5affdc7470abf159ef9eda':
  Resolve based on the correct user's default browser
 2015-07-15 23:12:59 +00:00
Svetoslav
08dda27be4 Merge "Make sure we get valid package name or fail." into mnc-dev 2015-07-15 23:03:49 +00:00
Abodunrinwa Toki
e3be3cc76d am b2777867: am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 
* commit 'b277786736e41525a232ad7ecb61de706311b295':
  Let the ActionBar handle keyboard shortcuts.
 2015-07-15 23:03:45 +00:00
Svetoslav
7395cbf070 Make sure we get valid package name or fail. 
bug:22492225

Change-Id: I7b7dce9a8e398c4615bcb700de80241e94c4320c
 2015-07-15 15:58:44 -07:00
Christopher Tate
06476508c4 Merge "Resolve based on the correct user's default browser" into mnc-dev 2015-07-15 22:57:53 +00:00
Abodunrinwa Toki
b277786736 am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 
* commit '6a4014104e85bf4154b353cd0be337f7967cdaeb':
  Let the ActionBar handle keyboard shortcuts.
 2015-07-15 22:50:16 +00:00
Miao Wang
469b4114ba am 675bed54: am ad904cf3: Merge "fix BNNM docs" into mnc-dev 
* commit '675bed5488edc7af164ca29258630d7c53984040':
  fix BNNM docs
 2015-07-15 22:46:05 +00:00
Svet Ganov
9088c083e6 am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev 
* commit '12b05ec2e7a22fa0cbc1bc55d5a8b6503dbf038c':
  Grant default permissions to the setup app robustly.
 2015-07-15 22:46:01 +00:00
Geoff Mendal
40e3b4b5c1 am 76b8b1e6: (-s ours) am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '76b8b1e663553ecf92d669c02747692233545584':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:57 +00:00
Adrian Roos
c71f3a2d4a am 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev 
* commit '2fc6e2b57ddfac58ce1fbded6f8a64a0b2fc9d70':
  Show correct locked orientation on phones
 2015-07-15 22:45:53 +00:00
Geoff Mendal
c716701096 am 9139d5b0: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '9139d5b0fd3b523deb6fffe534fc07c462604483':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:49 +00:00
Geoff Mendal
a2ab4fc826 am f88916ca: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f88916cabcc3d4ce885226789ecbdb1a7db722b7':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:45 +00:00
Geoff Mendal
c05bf35e17 am ccec9777: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'ccec9777f4ec0ac7d1f50e5b2e0a881d86d12a8b':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:41 +00:00
Geoff Mendal
80e9c04e91 am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f48b416e9806f374f95cfcfc35b60db82bb272a8':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:37 +00:00
Geoff Mendal
69032a7a23 am 0959738e: (-s ours) am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '0959738e5c0fda80bb655ae1fe317e3f395c6a72':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:33 +00:00