Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,247 Commits 3 Branches 0 Tags
8f587bfb05c0db2d48692c9701ac2d97e43acdc1
Commit Graph

50128 Commits

Author SHA1 Message Date
Dianne Hackborn
ee924dedcc am 587f0c58: am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit '587f0c58f506b167667c789c16292c4e405eac1f':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 22:36:06 +00:00
Dianne Hackborn
61f0aec4f3 am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit '9236af43d8418459b939049d4e7a092d2b58bff8':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 22:11:51 +00:00
Dianne Hackborn
9236af43d8 am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit 'aaee5b5334746cabd59aed69153d08ecbb70ab1d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 21:51:49 +00:00
Dianne Hackborn
aaee5b5334 Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 2015-07-16 21:44:21 +00:00
Svet Ganov
a73c88dbb8 am d019bce4: am e7b7049b: am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 
* commit 'd019bce4129b224e638dd4ec235387f85d19e052':
  Return a result from Fragment#shouldShowRequestPermissionRationale
 2015-07-16 20:12:01 +00:00
Svet Ganov
e7b7049b95 am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 
* commit 'f8847c02dce2c8ca66d29f8debf120c275b41f09':
  Return a result from Fragment#shouldShowRequestPermissionRationale
 2015-07-16 19:42:29 +00:00
Svet Ganov
f8847c02dc am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 
* commit 'db8fa48ed0864125a07f2bbe078fd60abd875ac7':
  Return a result from Fragment#shouldShowRequestPermissionRationale
 2015-07-16 19:27:18 +00:00
Svet Ganov
db8fa48ed0 Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 2015-07-16 19:16:59 +00:00
Dianne Hackborn
a7cfbe0e54 Work on issue #22516282: ChooserTarget URI grants not forwarded 
Add new option to startActivityAsCaller() which allows you to
specify that we should not do security checks on the target
activity being launched.

Change-Id: Ie6b28807b96fef35ccdff93b0a01066cfd8fa307
 2015-07-16 10:52:52 -07:00
Svet Ganov
9e136b88ba Return a result from Fragment#shouldShowRequestPermissionRationale 
bug:22523342

Change-Id: Ibacedec952316db705c57204fa448dbcada1c3e6
 2015-07-16 09:58:43 -07:00
Tony Mak
de0fa318fb am 364c8065: am 5eea2455: am 245466b5: am 532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev 
* commit '364c80657b8d70b1606845a987995b21e4f857b2':
  Fix calendar reminder notification is not shown in idle state
 2015-07-16 15:43:56 +00:00
Tony Mak
5eea245598 am 245466b5: am 532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev 
* commit '245466b5734546264b0492455fd2f6dc135daf39':
  Fix calendar reminder notification is not shown in idle state
 2015-07-16 15:15:32 +00:00
George Mount
5ee9088a33 am d3682f6d: am aa476de5: am 2456f77c: am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev 
* commit 'd3682f6da6550c1a63ab62d5be0bb8622acd05d6':
  Make additional shared elements a version-checked feature.
 2015-07-16 15:09:51 +00:00
Tony Mak
245466b573 am 532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev 
* commit '532737df65330200dc55ae42d31140d19c4024be':
  Fix calendar reminder notification is not shown in idle state
 2015-07-16 15:03:56 +00:00
Tony Mak
532737df65 Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev 2015-07-16 14:50:19 +00:00
George Mount
aa476de575 am 2456f77c: am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev 
* commit '2456f77c3f3ab001ac20cd7d8ee099c14f98271f':
  Make additional shared elements a version-checked feature.
 2015-07-16 14:42:29 +00:00
George Mount
2456f77c3f am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev 
* commit 'bd87b6b5b0c478c45d0dd5725cbc59995e751c64':
  Make additional shared elements a version-checked feature.
 2015-07-16 14:29:42 +00:00
George Mount
bd87b6b5b0 Merge "Make additional shared elements a version-checked feature." into mnc-dev 2015-07-16 14:24:09 +00:00
George Mount
2c256a04ae Make additional shared elements a version-checked feature. 
Bug 22505481

ag/684544 added a feature to allow shared elements that weren't
shared into an Activity to be shared back. However, if you are
targeting an older version of the SDK, you may get an unexpected
shared element back. This change in behavior has been locked
behind a target version check.

Change-Id: I7162e24f3b14fedd6b308e89e9d04ac67660f7d6
 2015-07-16 07:09:42 -07: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
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
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
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
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
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
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