Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
207,521 Commits 3 Branches 0 Tags
fd166329be9fa223bb28ebfef53c73fe4bb50143
Commit Graph

51081 Commits

Author SHA1 Message Date
Billy Lau
dd46de68ad am 1178526c: am 0d360d17: am fa2584f6: am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 
* commit '1178526c352a6784b520cd10a3a5686f9427d1b9':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
 2015-07-16 01:31:56 +00:00
Billy Lau
1178526c35 am 0d360d17: am fa2584f6: am da93454b: am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 
* commit '0d360d17a4307f32f3179ade4d3730d0a02d227d':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
 2015-07-16 01:13:18 +00:00
Dianne Hackborn
0bc31f6d73 am b876fb5a: am d649b575: am f9aa4b4d: am 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 
* commit 'b876fb5aef80cb9cf4143c32a473afaa0b6f885e':
  Implement issue #22403908: Enable assistant to refuse context sharing
 2015-07-16 00:40:29 +00:00
Dianne Hackborn
c597f21afa am 213a883a: am 822fd8f1: am 178d35d4: am fc569640: am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev 
* commit '213a883a3ca5671ce43f7077e7618a1d2adc7e0c':
  Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...
 2015-07-16 00:40:12 +00:00
Dianne Hackborn
5539adc0dc am 335d1f72: am 6af63384: am e12c549b: am 0d04da1f: am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 
* commit '335d1f7273fd0394cc90402af0365342c245af5c':
  Fix issue #22124996: VI: Command Request not Active
 2015-07-16 00:39:56 +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
Dianne Hackborn
b876fb5aef am d649b575: am f9aa4b4d: am 309f9d6e: am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev 
* commit 'd649b5751c9b7f592efb3653cfee39aeda45677b':
  Implement issue #22403908: Enable assistant to refuse context sharing
 2015-07-16 00:24:41 +00:00
Dianne Hackborn
213a883a3c am 822fd8f1: am 178d35d4: am fc569640: am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev 
* commit '822fd8f190696f4082537cec51c8a71790bd4885':
  Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always...
 2015-07-16 00:24:29 +00:00
Dianne Hackborn
335d1f7273 am 6af63384: am e12c549b: am 0d04da1f: am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 
* commit '6af6338419a3c5717400df2a133d0436d2aa4ea5':
  Fix issue #22124996: VI: Command Request not Active
 2015-07-16 00:24:15 +00:00
Svetoslav
3e9079c978 am f25f3bd8: am 3c5fe9de: am 1f1f0cee: am eb16e1fb: am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev 
* commit 'f25f3bd8718df8845c83f96e4f87d6dd3b974d0c':
  Make sure we get valid package name or fail.
 2015-07-16 00:22:02 +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
Svetoslav
f25f3bd871 am 3c5fe9de: am 1f1f0cee: am eb16e1fb: am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev 
* commit '3c5fe9de7fdbab2db277b8136552d85e809f0d54':
  Make sure we get valid package name or fail.
 2015-07-16 00:05:12 +00:00
Billy Lau
008409a2ea Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 2015-07-16 00:04:35 +00: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
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
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
Abodunrinwa Toki
8542fc6f9e am 81693398: am 7572e694: am e3be3cc7: am b2777867: am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 
* commit '816933989ff3c88ba13fca11bcd58c5615849207':
  Let the ActionBar handle keyboard shortcuts.
 2015-07-15 23:47:37 +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
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
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
Abodunrinwa Toki
816933989f am 7572e694: am e3be3cc7: am b2777867: am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 
* commit '7572e6940c1ca2ecf90207baac0046bf7115cfb4':
  Let the ActionBar handle keyboard shortcuts.
 2015-07-15 23:38:45 +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
Svet Ganov
5dc71cb2dd am ffb43184: am 3d8e949a: am 9088c083: am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev 
* commit 'ffb4318447f7741b4901dd38e3f6d97c94794b42':
  Grant default permissions to the setup app robustly.
 2015-07-15 23:32:14 +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
Jeff Brown
4085a74b4c am 209c8ced: am 6e4997db: am 8bdd92d4: am 0cb1cfdc: am 76c4c666: Add USB port manager. 
* commit '209c8cedab87359564c032a3e56b3acd452e1ac9':
  Add USB port manager.
 2015-07-15 23:30:28 +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
1cf8b0b6bf Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 2015-07-15 23:29:56 +00:00
Svet Ganov
ffb4318447 am 3d8e949a: am 9088c083: am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev 
* commit '3d8e949a7767b204eb9504d3c5267de9e0fd6899':
  Grant default permissions to the setup app robustly.
 2015-07-15 23:18:40 +00:00
Jeff Brown
209c8cedab am 6e4997db: am 8bdd92d4: am 0cb1cfdc: am 76c4c666: Add USB port manager. 
* commit '6e4997dbfb5f0a2abac99522a52b557172757ee2':
  Add USB port manager.
 2015-07-15 23:16:55 +00: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
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
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
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
Jeff Brown
8bdd92d44e am 0cb1cfdc: am 76c4c666: Add USB port manager. 
* commit '0cb1cfdcc306f78030403c8da22bfcda630c5527':
  Add USB port manager.
 2015-07-15 22:45:03 +00:00
Jim Miller
aa1a35ba27 am 2e56339a: am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit '2e56339a4a1133e9aface1c851f1ab67cff72109':
  Improve tracking of screen on reasons.
 2015-07-15 22:40:32 +00:00
Abodunrinwa Toki
6a4014104e Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 2015-07-15 22:39:21 +00:00
Svet Ganov
12b05ec2e7 am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev 
* commit '75f6b94a5d5cadb218725011729466e8e438b231':
  Grant default permissions to the setup app robustly.
 2015-07-15 22:28:10 +00:00
Jeff Brown
0cb1cfdcc3 am 76c4c666: Add USB port manager. 
* commit '76c4c6668a1486bc003ab0c585bb1f41d16e27a7':
  Add USB port manager.
 2015-07-15 22:26:38 +00:00
Jim Miller
2e56339a4a am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit 'bcedcde8093b48c3d013cc57dde42bdd17d6dcb9':
  Improve tracking of screen on reasons.
 2015-07-15 22:26:05 +00:00
Jim Miller
204c2de8bb am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit 'c7b0435cc709c328da8e2b515ea04c8bc40d1094':
  Improve tracking of screen on reasons.
 2015-07-15 21:59:27 +00:00
Svet Ganov
75f6b94a5d Merge "Grant default permissions to the setup app robustly." into mnc-dev 2015-07-15 21:58:50 +00:00
Svet Ganov
50a8bf4da0 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
 2015-07-15 14:46:23 -07:00
Jim Miller
c7b0435cc7 resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a
 2015-07-15 14:33:10 -07:00
Dianne Hackborn
1de1186d28 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
 2015-07-15 14:20:51 -07:00
Anthony Hugh
66cba90940 am 773f1b2f: am 26fa501d: DO NOT MERGE: Introduce stem keycodes for Wear 
* commit '773f1b2f919bb4c1f2724eabe8480b6589d8c498':
  DO NOT MERGE: Introduce stem keycodes for Wear
 2015-07-15 21:08:39 +00:00
Anthony Hugh
26fa501dd6 DO NOT MERGE: Introduce stem keycodes for Wear 
Cherry-pick from master

This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch.  There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.

BUG: 21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
 2015-07-15 13:34:25 -07:00
Jeff Brown
76c4c6668a Add USB port manager. 
Add some new internal APIs to enumerate USB Type C ports, query their
status, determine whether they support changing power or data roles,
and doing so.  The API also adds a new ACTION_USB_PORT_CHANGED broadcast
for port state changes.

The implementation includes a mechanism for simulating the behavior
of the USB stack.  See 'adb shell dumpsys usb -h' for details.

Note that the underlying kernel driver interface is still subject
to change but its behavior has been encapsulated as much as possible.

Bug: 21615151
Change-Id: I0c853ae179248a4550b3e60d02a7a7e65e4546b2
 2015-07-15 11:34:29 -07:00
Dianne Hackborn
fcbfeaf069 Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always... 
...returns true

Well it wasn't *quite* always, but close enough. :p

Change-Id: I990b8b2ca7b80ce68a067b0dd92efc1c2faaa8cd
 2015-07-15 11:25:55 -07:00