OSDN Git Service

android-x86/frameworks-base.git
9 years agoam ebcc6f09: am 8703e50d: Merge "Allow selecting quick setting items by keyboard...
Jun Mukai [Thu, 16 Jul 2015 00:57:50 +0000 (00:57 +0000)]
am ebcc6f09: am 8703e50d: Merge "Allow selecting quick setting items by keyboard." into mnc-dev

* commit 'ebcc6f097e6bf1bc0d41e6665c84c8359305ebf1':
  Allow selecting quick setting items by keyboard.

9 years agoam 79362baf: am 84f8a096: Merge "Make "dismiss all" button keyboard accessible."...
Oren Blasberg [Thu, 16 Jul 2015 00:57:46 +0000 (00:57 +0000)]
am 79362baf: am 84f8a096: Merge "Make "dismiss all" button keyboard accessible." into mnc-dev

* commit '79362baf5f5a1edb4ff07814ed5c85c72e79fd38':
  Make "dismiss all" button keyboard accessible.

9 years agoam b8550d30: am fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into...
Adrian Roos [Thu, 16 Jul 2015 00:42:49 +0000 (00:42 +0000)]
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

9 years agoam fbb4e9d2: am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app...
Christopher Tate [Thu, 16 Jul 2015 00:42:45 +0000 (00:42 +0000)]
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

9 years agoam 8703e50d: Merge "Allow selecting quick setting items by keyboard." into mnc-dev
Jun Mukai [Thu, 16 Jul 2015 00:41:35 +0000 (00:41 +0000)]
am 8703e50d: Merge "Allow selecting quick setting items by keyboard." into mnc-dev

* commit '8703e50d130351ef45d1ac88755ec58d8ecac737':
  Allow selecting quick setting items by keyboard.

9 years agoam 84f8a096: Merge "Make "dismiss all" button keyboard accessible." into mnc-dev
Oren Blasberg [Thu, 16 Jul 2015 00:41:31 +0000 (00:41 +0000)]
am 84f8a096: Merge "Make "dismiss all" button keyboard accessible." into mnc-dev

* commit '84f8a0969322b2d5f40ea1eac0db9996e1876138':
  Make "dismiss all" button keyboard accessible.

9 years agoMerge "Allow selecting quick setting items by keyboard." into mnc-dev
Jun Mukai [Thu, 16 Jul 2015 00:37:13 +0000 (00:37 +0000)]
Merge "Allow selecting quick setting items by keyboard." into mnc-dev

9 years agoam da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..."...
Billy Lau [Thu, 16 Jul 2015 00:31:35 +0000 (00:31 +0000)]
am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev

* commit 'da93454bfa7c46ba5607c74252c458b48a473e9d':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...

9 years agoam fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev
Adrian Roos [Thu, 16 Jul 2015 00:31:23 +0000 (00:31 +0000)]
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

9 years agoam 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible...
Christopher Tate [Thu, 16 Jul 2015 00:31:18 +0000 (00:31 +0000)]
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

9 years agoMerge "Make "dismiss all" button keyboard accessible." into mnc-dev
Oren Blasberg [Thu, 16 Jul 2015 00:29:33 +0000 (00:29 +0000)]
Merge "Make "dismiss all" button keyboard accessible." into mnc-dev

9 years agoMerge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev
Adrian Roos [Thu, 16 Jul 2015 00:27:48 +0000 (00:27 +0000)]
Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev

9 years agoam 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
Billy Lau [Thu, 16 Jul 2015 00:21:44 +0000 (00:21 +0000)]
am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev

* commit '008409a2ea1feed095d53ce51429e4fed964c50c':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...

9 years agoMerge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev
Christopher Tate [Thu, 16 Jul 2015 00:20:55 +0000 (00:20 +0000)]
Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev

9 years agoMerge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
Billy Lau [Thu, 16 Jul 2015 00:04:32 +0000 (00:04 +0000)]
Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev

9 years agoIntent filters need CATEGORY_BROWSABLE to be app-linking eligible
Christopher Tate [Wed, 15 Jul 2015 23:56:58 +0000 (16:56 -0700)]
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible

Bug 22504009

Change-Id: I565b2ba4d1e5deeee8ede3363819deec206dbf58

9 years agoam 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refus...
Dianne Hackborn [Wed, 15 Jul 2015 23:51:54 +0000 (23:51 +0000)]
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

9 years agoam 709d013f: am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock...
Dianne Hackborn [Wed, 15 Jul 2015 23:51:50 +0000 (23:51 +0000)]
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)

9 years agoam fc569640: am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssi...
Dianne Hackborn [Wed, 15 Jul 2015 23:51:45 +0000 (23:51 +0000)]
am fc569640: am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev

* commit 'fc5696404b88035aa9197faeb2ee0bdca284ca76':
  Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...

9 years agoam b3e37b3b: am c1a49b50: Merge "Fix issue #22479881: Nexus 6 randomly rebooting...
Dianne Hackborn [Wed, 15 Jul 2015 23:51:39 +0000 (23:51 +0000)]
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...

9 years agoam 0d04da1f: am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active...
Dianne Hackborn [Wed, 15 Jul 2015 23:51:34 +0000 (23:51 +0000)]
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

9 years agoam db19e1de: Merge "Fix the build" into mnc-dr-dev
Jim Miller [Wed, 15 Jul 2015 23:51:29 +0000 (23:51 +0000)]
am db19e1de: Merge "Fix the build" into mnc-dr-dev

* commit 'db19e1ded0d9bec62e798c6ba7677eefa4ff7c64':
  Fix the build

9 years agoam f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context...
Dianne Hackborn [Wed, 15 Jul 2015 23:39:32 +0000 (23:39 +0000)]
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

9 years agoam 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_serv...
Dianne Hackborn [Wed, 15 Jul 2015 23:39:27 +0000 (23:39 +0000)]
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)

9 years agoam c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked...
Dianne Hackborn [Wed, 15 Jul 2015 23:39:20 +0000 (23:39 +0000)]
am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev

* commit 'c4e2bcd4dca0401ca38a45dce04d29b92231d677':
  Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...

9 years agoam c1a49b50: Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours...
Dianne Hackborn [Wed, 15 Jul 2015 23:39:16 +0000 (23:39 +0000)]
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...

9 years agoam 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 23:39:12 +0000 (23:39 +0000)]
am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev

* commit '1cf8b0b6bfbbf867512fcd7bbb4763692821ed36':
  Fix issue #22124996: VI: Command Request not Active

9 years agoBug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
Billy Lau [Wed, 15 Jul 2015 21:29:19 +0000 (22:29 +0100)]
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

9 years agoMerge "Fix the build" into mnc-dr-dev
Jim Miller [Wed, 15 Jul 2015 23:32:29 +0000 (23:32 +0000)]
Merge "Fix the build" into mnc-dr-dev

9 years agoMerge "Implement issue #22403908: Enable assistant to refuse context sharing" into...
Dianne Hackborn [Wed, 15 Jul 2015 23:31:09 +0000 (23:31 +0000)]
Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev

9 years agoMerge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into...
Dianne Hackborn [Wed, 15 Jul 2015 23:30:49 +0000 (23:30 +0000)]
Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev

9 years agoMerge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always......
Dianne Hackborn [Wed, 15 Jul 2015 23:30:16 +0000 (23:30 +0000)]
Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev

9 years agoam eb16e1fb: am 08dda27b: Merge "Make sure we get valid package name or fail." into...
Svetoslav [Wed, 15 Jul 2015 23:30:09 +0000 (23:30 +0000)]
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.

9 years agoMerge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into...
Dianne Hackborn [Wed, 15 Jul 2015 23:30:06 +0000 (23:30 +0000)]
Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev

9 years agoam b6b97e90: am 06476508: Merge "Resolve based on the correct user\'s default browser...
Christopher Tate [Wed, 15 Jul 2015 23:30:05 +0000 (23:30 +0000)]
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

9 years agoMerge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 23:29:53 +0000 (23:29 +0000)]
Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev

9 years agoFix the build
Jim Miller [Wed, 15 Jul 2015 23:29:30 +0000 (16:29 -0700)]
Fix the build

Build broken due to a bad merge.

Change-Id: Id10b3db5d1bde2a2c9e8995e35b4fc58c5468544

9 years agoam 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev
Svetoslav [Wed, 15 Jul 2015 23:13:03 +0000 (23:13 +0000)]
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.

9 years agoam 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev
Christopher Tate [Wed, 15 Jul 2015 23:12:59 +0000 (23:12 +0000)]
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

9 years agoMerge "Make sure we get valid package name or fail." into mnc-dev
Svetoslav [Wed, 15 Jul 2015 23:03:45 +0000 (23:03 +0000)]
Merge "Make sure we get valid package name or fail." into mnc-dev

9 years agoam b2777867: am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into...
Abodunrinwa Toki [Wed, 15 Jul 2015 23:03:45 +0000 (23:03 +0000)]
am b2777867: am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev

* commit 'b277786736e41525a232ad7ecb61de706311b295':
  Let the ActionBar handle keyboard shortcuts.

9 years agoMake sure we get valid package name or fail.
Svetoslav [Wed, 15 Jul 2015 22:58:01 +0000 (15:58 -0700)]
Make sure we get valid package name or fail.

bug:22492225

Change-Id: I7b7dce9a8e398c4615bcb700de80241e94c4320c

9 years agoMerge "Resolve based on the correct user's default browser" into mnc-dev
Christopher Tate [Wed, 15 Jul 2015 22:57:49 +0000 (22:57 +0000)]
Merge "Resolve based on the correct user's default browser" into mnc-dev

9 years agoam 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
Abodunrinwa Toki [Wed, 15 Jul 2015 22:50:16 +0000 (22:50 +0000)]
am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev

* commit '6a4014104e85bf4154b353cd0be337f7967cdaeb':
  Let the ActionBar handle keyboard shortcuts.

9 years agoam 675bed54: am ad904cf3: Merge "fix BNNM docs" into mnc-dev
Miao Wang [Wed, 15 Jul 2015 22:46:05 +0000 (22:46 +0000)]
am 675bed54: am ad904cf3: Merge "fix BNNM docs" into mnc-dev

* commit '675bed5488edc7af164ca29258630d7c53984040':
  fix BNNM docs

9 years agoam 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly...
Svet Ganov [Wed, 15 Jul 2015 22:46:01 +0000 (22:46 +0000)]
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.

9 years agoam 76b8b1e6: (-s ours) am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 15 Jul 2015 22:45:57 +0000 (22:45 +0000)]
am 76b8b1e6: (-s ours) am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '76b8b1e663553ecf92d669c02747692233545584':
  Import translations. DO NOT MERGE

9 years agoam 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into...
Adrian Roos [Wed, 15 Jul 2015 22:45:53 +0000 (22:45 +0000)]
am 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev

* commit '2fc6e2b57ddfac58ce1fbded6f8a64a0b2fc9d70':
  Show correct locked orientation on phones

9 years agoam 9139d5b0: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 15 Jul 2015 22:45:49 +0000 (22:45 +0000)]
am 9139d5b0: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9139d5b0fd3b523deb6fffe534fc07c462604483':
  Import translations. DO NOT MERGE

9 years agoam f88916ca: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 15 Jul 2015 22:45:45 +0000 (22:45 +0000)]
am f88916ca: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'f88916cabcc3d4ce885226789ecbdb1a7db722b7':
  Import translations. DO NOT MERGE

9 years agoam ccec9777: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 15 Jul 2015 22:45:41 +0000 (22:45 +0000)]
am ccec9777: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'ccec9777f4ec0ac7d1f50e5b2e0a881d86d12a8b':
  Import translations. DO NOT MERGE

9 years agoam f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 15 Jul 2015 22:45:37 +0000 (22:45 +0000)]
am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'f48b416e9806f374f95cfcfc35b60db82bb272a8':
  Import translations. DO NOT MERGE

9 years agoam 0959738e: (-s ours) am ff994bd3: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 15 Jul 2015 22:45:33 +0000 (22:45 +0000)]
am 0959738e: (-s ours) am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '0959738e5c0fda80bb655ae1fe317e3f395c6a72':
  Import translations. DO NOT MERGE

9 years agoam 2e51738d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 15 Jul 2015 22:45:29 +0000 (22:45 +0000)]
am 2e51738d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '2e51738d7c93e547dbd484014e11d770270030e0':
  Import translations. DO NOT MERGE

9 years agoam f427688c: (-s ours) am e2a0d44c: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 15 Jul 2015 22:45:24 +0000 (22:45 +0000)]
am f427688c: (-s ours) am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'f427688c37561a525927db8003c1fcb3f9cbed94':
  Import translations. DO NOT MERGE

9 years agoam 7be40aaa: am eea8be53: Adjust assist disclosure stroke width to spec
Jorim Jaggi [Wed, 15 Jul 2015 22:45:20 +0000 (22:45 +0000)]
am 7be40aaa: am eea8be53: Adjust assist disclosure stroke width to spec

* commit '7be40aaa6b1df159962134ff8314539d2805ec43':
  Adjust assist disclosure stroke width to spec

9 years agoam 06179c75: am 4e9c63cb: Merge "Handle exceptions when accessing Content providers...
Roshan Pius [Wed, 15 Jul 2015 22:45:16 +0000 (22:45 +0000)]
am 06179c75: am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev

* commit '06179c75c84476e96b99004fb677ef9d50dbcdfc':
  Handle exceptions when accessing Content providers.

9 years agoam d9ab0ca2: am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry...
Felipe Leme [Wed, 15 Jul 2015 22:45:11 +0000 (22:45 +0000)]
am d9ab0ca2: am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev

* commit 'd9ab0ca287a9ab1b5af19d70cb9b13e0e16cfcba':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.

9 years agoam 4a56983f: am d193916c: Merge "Fix build." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 22:45:07 +0000 (22:45 +0000)]
am 4a56983f: am d193916c: Merge "Fix build." into mnc-dev

* commit '4a56983fa707985fe5e5ab050acd7306e123d075':
  Fix build.

9 years agoam 0cb1cfdc: am 76c4c666: Add USB port manager.
Jeff Brown [Wed, 15 Jul 2015 22:45:03 +0000 (22:45 +0000)]
am 0cb1cfdc: am 76c4c666: Add USB port manager.

* commit '0cb1cfdcc306f78030403c8da22bfcda630c5527':
  Add USB port manager.

9 years agoam b3c11805: am 2dbccc19: Clean up USB Manager dump.
Jeff Brown [Wed, 15 Jul 2015 22:44:59 +0000 (22:44 +0000)]
am b3c11805: am 2dbccc19: Clean up USB Manager dump.

* commit 'b3c1180538d46a0844620375b67a453acdb456fe':
  Clean up USB Manager dump.

9 years agoMerge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
Abodunrinwa Toki [Wed, 15 Jul 2015 22:38:55 +0000 (22:38 +0000)]
Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev

9 years agoam ad904cf3: Merge "fix BNNM docs" into mnc-dev
Miao Wang [Wed, 15 Jul 2015 22:34:47 +0000 (22:34 +0000)]
am ad904cf3: Merge "fix BNNM docs" into mnc-dev

* commit 'ad904cf34219897da731eb65f9de53176cc39b20':
  fix BNNM docs

9 years agoam 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
Svet Ganov [Wed, 15 Jul 2015 22:28:10 +0000 (22:28 +0000)]
am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev

* commit '75f6b94a5d5cadb218725011729466e8e438b231':
  Grant default permissions to the setup app robustly.

9 years agoam 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 22:28:06 +0000 (22:28 +0000)]
am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '78b6e6c742a7872ba23c3684c47ff714dbd80cf6':
  Import translations. DO NOT MERGE

9 years agoam 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev
Adrian Roos [Wed, 15 Jul 2015 22:28:02 +0000 (22:28 +0000)]
am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev

* commit '3a931d028a0c43fe276b0adfdc6b87ac48dd5df3':
  Show correct locked orientation on phones

9 years agoam 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 22:27:58 +0000 (22:27 +0000)]
am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '4155d9f37762a6a91d47c383f9c3a9fd3aa7f884':
  Import translations. DO NOT MERGE

9 years agoam 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 22:27:54 +0000 (22:27 +0000)]
am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '197e7381576bee4b8e2e7195811fe94d1b1b28ec':
  Import translations. DO NOT MERGE

9 years agoam 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 22:27:44 +0000 (22:27 +0000)]
am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '6e149a2537167f90b1db2430c19ccdf064548b91':
  Import translations. DO NOT MERGE

9 years agoam a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 22:27:39 +0000 (22:27 +0000)]
am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'a5516e80ad76fb5cfe520ddd0c5babf2dccf2e5a':
  Import translations. DO NOT MERGE

9 years agoam ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 22:27:35 +0000 (22:27 +0000)]
am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'ff994bd31b2768eb38efb6c623f0fb6e13d9d61b':
  Import translations. DO NOT MERGE

9 years agoam 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 22:27:31 +0000 (22:27 +0000)]
am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '36c103d685a6ba0f04c52bad2cb666789f5179dc':
  Import translations. DO NOT MERGE

9 years agoam e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 22:27:26 +0000 (22:27 +0000)]
am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'e2a0d44c8a837ac44dfc627ef3ca8d5242e78959':
  Import translations. DO NOT MERGE

9 years agoam eea8be53: Adjust assist disclosure stroke width to spec
Jorim Jaggi [Wed, 15 Jul 2015 22:27:07 +0000 (22:27 +0000)]
am eea8be53: Adjust assist disclosure stroke width to spec

* commit 'eea8be533874f279016279cd68618a6592b3dbed':
  Adjust assist disclosure stroke width to spec

9 years agoam 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev
Roshan Pius [Wed, 15 Jul 2015 22:26:55 +0000 (22:26 +0000)]
am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev

* commit '4e9c63cbe1712f750d5eaaa044e957c7f7696bf8':
  Handle exceptions when accessing Content providers.

9 years agoam 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped...
Felipe Leme [Wed, 15 Jul 2015 22:26:47 +0000 (22:26 +0000)]
am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev

* commit '68fd7c798d213bbe304775b13d775ee868abb448':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.

9 years agoam d193916c: Merge "Fix build." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 22:26:42 +0000 (22:26 +0000)]
am d193916c: Merge "Fix build." into mnc-dev

* commit 'd193916c83015d54466ad998fb9373f15da754a7':
  Fix build.

9 years agoam 76c4c666: Add USB port manager.
Jeff Brown [Wed, 15 Jul 2015 22:26:38 +0000 (22:26 +0000)]
am 76c4c666: Add USB port manager.

* commit '76c4c6668a1486bc003ab0c585bb1f41d16e27a7':
  Add USB port manager.

9 years agoam 2dbccc19: Clean up USB Manager dump.
Jeff Brown [Wed, 15 Jul 2015 22:26:34 +0000 (22:26 +0000)]
am 2dbccc19: Clean up USB Manager dump.

* commit '2dbccc1926ea2d3e27c5cfd2d61d2b3d5ed787c0':
  Clean up USB Manager dump.

9 years agoMerge "fix BNNM docs" into mnc-dev
Miao Wang [Wed, 15 Jul 2015 22:21:11 +0000 (22:21 +0000)]
Merge "fix BNNM docs" into mnc-dev

9 years agoam 6819696c: am 539f7ac7: Merge "Give DCS permission needed to measure all users...
Jeff Sharkey [Wed, 15 Jul 2015 21:59:36 +0000 (21:59 +0000)]
am 6819696c: am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev

* commit '6819696c0e00ce3805de66f13ec6deda2489fd32':
  Give DCS permission needed to measure all users.

9 years agoam 350b99c0: am 483bd842: Merge "Only send EXTRA_STACK for private intent." into...
Jeff Sharkey [Wed, 15 Jul 2015 21:59:31 +0000 (21:59 +0000)]
am 350b99c0: am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev

* commit '350b99c0027902db22004ea037265349155d7c38':
  Only send EXTRA_STACK for private intent.

9 years agoam c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
Jim Miller [Wed, 15 Jul 2015 21:59:27 +0000 (21:59 +0000)]
am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev

* commit 'c7b0435cc709c328da8e2b515ea04c8bc40d1094':
  Improve tracking of screen on reasons.

9 years agoMerge "Grant default permissions to the setup app robustly." into mnc-dev
Svet Ganov [Wed, 15 Jul 2015 21:58:47 +0000 (21:58 +0000)]
Merge "Grant default permissions to the setup app robustly." into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:56:25 +0000 (21:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Show correct locked orientation on phones" into mnc-dev
Adrian Roos [Wed, 15 Jul 2015 21:56:12 +0000 (21:56 +0000)]
Merge "Show correct locked orientation on phones" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:55:49 +0000 (21:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:54:06 +0000 (21:54 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoResolve based on the correct user's default browser
Christopher Tate [Wed, 15 Jul 2015 21:52:29 +0000 (14:52 -0700)]
Resolve based on the correct user's default browser

Bug 22509659

Change-Id: Iac75e7b40609bf2c81d266e0568fbfbeb71bb3aa

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:50:46 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:48:18 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:47:12 +0000 (21:47 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoGrant default permissions to the setup app robustly.
Svet Ganov [Wed, 15 Jul 2015 18:04:18 +0000 (11:04 -0700)]
Grant default permissions to the setup app robustly.

There is a zoo of components that handle the home intent and
have different priority. There is no reliable way to distinguish
the setup app from the other apps that handle home as some of
them have lower priority than the setup app and some higher.
This change adds a dedicated category to recognize the default
setup app.

Uncommented the code that grants accounts permissions as the
get_accounts permission is now a runtime permission and can be
granted.

bug:22471024
bug:22501463

Change-Id: I41726751fa2567cbcd7d09c7acfa7615b8aba577

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:44:00 +0000 (21:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoam 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev
Jeff Sharkey [Wed, 15 Jul 2015 21:43:55 +0000 (21:43 +0000)]
am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev

* commit '539f7ac7a195c405987057ef34e88cfbe8eab5e8':
  Give DCS permission needed to measure all users.

9 years agoam 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev
Jeff Sharkey [Wed, 15 Jul 2015 21:43:48 +0000 (21:43 +0000)]
am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev

* commit '483bd84280ef667e306ec7246d85423ca6b1fde7':
  Only send EXTRA_STACK for private intent.

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 15 Jul 2015 21:41:14 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoFix wrong tint mode on airplane and vpn icons
Adrian Roos [Wed, 15 Jul 2015 21:38:39 +0000 (14:38 -0700)]
Fix wrong tint mode on airplane and vpn icons

Bug: 22399062
Change-Id: If7d0e6d4d2ace947672f9a943bb274f07736ddb0

9 years agoresolved conflicts for merge of 1d4247c4 to mnc-dr-dev
Jim Miller [Wed, 15 Jul 2015 21:33:10 +0000 (14:33 -0700)]
resolved conflicts for merge of 1d4247c4 to mnc-dr-dev

Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a

9 years agoImplement issue #22403908: Enable assistant to refuse context sharing
Dianne Hackborn [Wed, 15 Jul 2015 21:20:51 +0000 (14:20 -0700)]
Implement issue #22403908: Enable assistant to refuse context sharing

New APIs allow the voice interaction service to set/retrieve a filter
for which of the show flags are allowed.

Change-Id: I588cbe55afee0548ad3afa22d3a7d3bc43cb54a6