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

59209 Commits

Author SHA1 Message Date
Felipe Leme
8b297e554d Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev am: 2c6a450fa2 
am: 3b91df7ccf

* commit '3b91df7ccf7ee4adf9914ffcdcbf220eb9f9fd08':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Idb223f33d6c5b1d4054bd41f4b9b9672c507986c
 2016-05-17 18:47:41 +00:00
Martijn Coenen
5832df526f Merge "Adddress NFC API review comments." into nyc-dev am: 1fef88d8dc 
am: 68b426a30d

* commit '68b426a30d964295360f32defc2b66e6b7247a93':
  Adddress NFC API review comments.

Change-Id: I00acef221305c4cb7aea75c842c1a758cccfb953
 2016-05-17 18:39:50 +00:00
Dianne Hackborn
ae5664af28 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev am: 607844efa5 
am: a24af982ff

* commit 'a24af982fffeeb6d3d4919907b5c27064c5a8ff1':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iea2b8a6b86f10122ea763e93e1516fce43e58dfa
 2016-05-17 18:39:42 +00:00
Felipe Leme
3b91df7ccf Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 
am: 2c6a450fa2

* commit '2c6a450fa23b97e6082e2daa1aa9c7f07a4def8f':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Id9cb27070e1e72b12c5ade60b637e63319021f90
 2016-05-17 18:39:02 +00:00
Martijn Coenen
225d221945 Merge "Adddress NFC API review comments." into nyc-dev 
am: 1fef88d8dc

* commit '1fef88d8dc8e25c71dc6b217202593e0f17b2105':
  Adddress NFC API review comments.

Change-Id: Ib327612766f91c583ea0a23e71bac34615edd12d
 2016-05-17 18:38:40 +00:00
Dianne Hackborn
4d7e92b56b Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iaf3102ba03cf2242b02030aa24df8282ed3fbdc8
 2016-05-17 18:38:28 +00:00
Martijn Coenen
68b426a30d Merge "Adddress NFC API review comments." into nyc-dev 
am: 1fef88d8dc

* commit '1fef88d8dc8e25c71dc6b217202593e0f17b2105':
  Adddress NFC API review comments.

Change-Id: Ic36b9392b9475590ba8f75b352d05fba52b1ee02
 2016-05-17 18:33:09 +00:00
Dianne Hackborn
a24af982ff Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: I749b455402caef335239b540ec8883a8d7b2a974
 2016-05-17 18:32:46 +00:00
TreeHugger Robot
2c6a450fa2 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 2016-05-17 18:28:22 +00:00
Martijn Coenen
1fef88d8dc Merge "Adddress NFC API review comments." into nyc-dev 2016-05-17 18:21:16 +00:00
Dianne Hackborn
607844efa5 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 2016-05-17 18:19:36 +00:00
Michael Kwan
4fab094b07 Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev 
am: 59bce44aaa

* commit '59bce44aaaad61c5bd57ddcc1225e69ad5d0500b':
  Modified AlertController to allow themes to specify custom implementation.

Change-Id: Ice8251602843a6a98552bcb85272d8cc9eefae2b
 2016-05-17 18:14:47 +00:00
Makoto Onuki
37d5cb3181 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 
am: 8295332d83

* commit '8295332d83d1e664a7ef3a731370ae71242688a1':
  ShortcutManager: API changes for DR

Change-Id: I0006667d4bbe2fa92015ac442ae1e8362cbcacbd
 2016-05-17 18:14:39 +00:00
Michael Kwan
59bce44aaa Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev 2016-05-17 18:03:38 +00:00
Makoto Onuki
8295332d83 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 2016-05-17 18:01:29 +00:00
Robin Lee
45d4f351ba Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: 4920698e17 
am: 607fa836b2

* commit '607fa836b2b60f411ae239bff5391dcaafbbc799':
  Make some of the UID-based VPN code reusable

Change-Id: Ie7c88ba3eebe4af85a69f330cae3df3293113d4e
 2016-05-17 17:52:45 +00:00
Robin Lee
0867543a06 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 
am: 4920698e17

* commit '4920698e17dc8aacd1b0743d313383a8ee1a3400':
  Make some of the UID-based VPN code reusable

Change-Id: I0e5b9aa4552ee11ae5ec2d2206cc58487fb9cd4c
 2016-05-17 17:39:14 +00:00
Robin Lee
607fa836b2 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 
am: 4920698e17

* commit '4920698e17dc8aacd1b0743d313383a8ee1a3400':
  Make some of the UID-based VPN code reusable

Change-Id: I3f1b1a08059aa58cb76db6cdd070b103024b9bf3
 2016-05-17 17:36:43 +00:00
Phil Weaver
bcaaac3ea1 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: Ie68602fc2b301430dcfa98d4b61515f2014db71a
 2016-05-17 17:36:17 +00:00
Phil Weaver
3070a2a97c Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 
am: 11ece94702

* commit '11ece94702f68f96af44cf7aafca462709bf4937':
  Hide UiAutomation#destroy as test api.

Change-Id: I06c78c7bb99268ea3fd559990d2acde3e611f3ab
 2016-05-17 17:35:24 +00:00
Phil Weaver
11ece94702 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: I91cbc4571a110be81f1c25fc0f19fed81d3b2819
 2016-05-17 17:32:24 +00:00
TreeHugger Robot
4920698e17 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 2016-05-17 17:30:01 +00:00
Phil Weaver
89d3ba72b7 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 2016-05-17 17:27:01 +00:00
Zoltan Szatmary-Ban
96489e0c2a Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 
am: 07e232371f

* commit '07e232371f5249de1c8fe4d8ac277b22b646576c':
  Introduce system API to get source of user restriction

Change-Id: Iaec13f6b56a138b67a066c9eb1c234a7a653c4bd
 2016-05-17 15:29:25 +00:00
Zoltan Szatmary-Ban
07e232371f Merge "Introduce system API to get source of user restriction" into nyc-dev 
am: 690c2ea117

* commit '690c2ea117f90b7759ac280a1c84f5966b1e7938':
  Introduce system API to get source of user restriction

Change-Id: Iec3a08471bc56a3aec1aff43b3c7361931c13539
 2016-05-17 15:24:20 +00:00
Zoltan Szatmary-Ban
fc66ec971c Merge "Introduce system API to get source of user restriction" into nyc-dev 
am: 690c2ea117

* commit '690c2ea117f90b7759ac280a1c84f5966b1e7938':
  Introduce system API to get source of user restriction

Change-Id: Iab98753f85774d741c5126395d56af194c8b0ca8
 2016-05-17 15:23:59 +00:00
Zoltan Szatmary-Ban
690c2ea117 Merge "Introduce system API to get source of user restriction" into nyc-dev 2016-05-17 15:16:56 +00:00
Clara Bayarri
4cfd27f9aa Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev am: bee2648027 
am: 60d0910dc8

* commit '60d0910dc8754a9e661ab9b68cdac0b316c35753':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: Ia917dd039f7ecde4bc3d093fe7f4900c66dfc590
 2016-05-17 09:24:52 +00:00
Clara Bayarri
60d0910dc8 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev 
am: bee2648027

* commit 'bee26480277234cb599a7131cd24ce3c5108e474':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: I1b5a1455199ba8e6ef6c877d7f4d4b13256eb1c6
 2016-05-17 09:21:15 +00:00
Clara Bayarri
ec200415f5 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev 
am: bee2648027

* commit 'bee26480277234cb599a7131cd24ce3c5108e474':
  Remove "if it succeeds" wording from requestShowKeyboardShortcuts

Change-Id: I2efdcb8828da9a455dc80911c3aa87ac7ec6eab5
 2016-05-17 09:20:43 +00:00
Clara Bayarri
bee2648027 Merge "Remove "if it succeeds" wording from requestShowKeyboardShortcuts" into nyc-dev 2016-05-17 09:12:36 +00:00
Martijn Coenen
6136730e3b Adddress NFC API review comments. 
Bug: 28775492
Change-Id: I01befba3435f0d882787fecabd3c1041fe7260d7
 2016-05-17 09:09:15 +02:00
Wale Ogunwale
f5a87d86bf Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee 
am: 33cffe3717

* commit '33cffe371778d21452fa5706d73f6dded29fb8de':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I314fdf74d69462ff021473697921a3b52f67d83e
 2016-05-17 01:05:00 +00:00
Wale Ogunwale
273d6e8f56 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I81250af945c186fbb687bc15ec03a85a019bd6e3
 2016-05-17 00:59:36 +00:00
Wale Ogunwale
33cffe3717 Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 
am: b406dd20ee

* commit 'b406dd20eee28eedb8e9f330a0459d630c026515':
  Fixed bugs with starting windows when displayng forcedResized activity

Change-Id: I9e3bc8825d837abe61d31dea27249f7bce6e7f9d
 2016-05-17 00:57:25 +00:00
TreeHugger Robot
b406dd20ee Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 2016-05-17 00:51:41 +00:00
Jorim Jaggi
bf9a7566df Handle multi-window for inset hint am: 23bf5462f0 
am: b7bd18bdc6

* commit 'b7bd18bdc67740aad7fd1fc4704dcf58857b4c58':
  Handle multi-window for inset hint

Change-Id: I2434e83d0885551653f2a449c4a6194940f139b0
 2016-05-16 23:32:21 +00:00
Jorim Jaggi
4958217aa4 Handle multi-window for inset hint 
am: 23bf5462f0

* commit '23bf5462f05b33ce4390d8370520e43b74dbec09':
  Handle multi-window for inset hint

Change-Id: I67d202891330ba78b6fbe62510261cc7f1449b42
 2016-05-16 23:27:56 +00:00
Wale Ogunwale
3b23239d6e Fixed bugs with starting windows when displayng forcedResized activity 
- Added ActivityOption to mark a starting activity as a taskOverlay
activity. That is the activity will always be the top activity of the
task and doesn't cause the task to be moved to the front when it is added.
- Only set the starting window state of the ActivityRecord to shown if
window manager actually showed the starting window for the activity.
Avoids incorrectly trying to remove starting window for an activity that
didn't show any.
- When starting additional activity in a task, transfer the starting
window from the top most activity with a starting window. It is possible
the top most window does have a starting window like in the case of the
forcedResized activity.
- Only ensure visiblity of an activity we are starting in a task whose top
activity is a task overlay. They need to start in the visible-paused state
and not the resumed state which just causes extra churn in the system.
- Always add additional starting activities in a task with an overlay
activity below the overlay activity.

Bug: 28751186
Change-Id: I3624a4313ae9c406d42c67a3537f67ad685791af
 2016-05-16 16:27:01 -07:00
Jorim Jaggi
b7bd18bdc6 Handle multi-window for inset hint 
am: 23bf5462f0

* commit '23bf5462f05b33ce4390d8370520e43b74dbec09':
  Handle multi-window for inset hint

Change-Id: I6165730cf338d85f4e4a38d4115b9f4f299807b2
 2016-05-16 23:26:53 +00:00
Makoto Onuki
20c95f854e ShortcutManager: API changes for DR 
See https://goto.google.com/shortcutmanager-spec-dr for
the details.

This CL contains changes to ShortcutInfo and all the new API
entry points, but not the implementation of the new APIs.

- ShortcutInfo.activityComponent is now mandatory.
- Publishers can now disable shortcuts.  ShortcutInfo can now have
"disabled message".
- ShortcutInfo now supports string resources for all the String
fields.
  -> When launcher fetches shortcuts, ShortcutService will
  automatically load resources and expose as strings.
- LauncherApps now supports getShortcutIconDrawable() and
getShortcutBadgedIconDrawable() to be consistent with
LauncherActivityInfo.

- ShortcutInfo.weight is replaced with "rank".

- Added ShortcutManager.reportShortcutUsed(), which will be used for
usage tracking / suggestion.

Bug 28536054
Bug 28536066
Bug 28564134
Bug 28594168

Change-Id: Ib8245b39bb1e753991a9de89c0b73accacd90355
 2016-05-16 16:25:50 -07:00
Jorim Jaggi
23bf5462f0 Handle multi-window for inset hint 
We need to incorporate task bounds when calculating the inset hint
so we don't specify something wrong to the client which we correct
immediately after.

Bug: 28697105
Change-Id: I23cec7d6cc62a4d982e0796a867e803d4cce0803
 2016-05-16 23:18:14 +00:00
Michael Kwan
cc6e6f0e0a Modified AlertController to allow themes to specify custom implementation. 
Bug: 17733928
Change-Id: I0264ee8ceee09dbc33da61365c424c74d2e3c3d6
 2016-05-16 15:36:22 -07:00
Felipe Leme
00463970fe Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev am: 522787f39a 
am: b811d4ede8

* commit 'b811d4ede8ca91d1118ccb44a290c0707a984c09':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Id6197b9ee56fd06505c21c1bb5dce083998aa79a
 2016-05-16 22:28:27 +00:00
Felipe Leme
d028ec4e29 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 
am: 522787f39a

* commit '522787f39a759cf8af8438641fa8df7470a1b959':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: I1187ffeeb42b61329674ca022735efa08c7e9d98
 2016-05-16 22:23:46 +00:00
Felipe Leme
b811d4ede8 Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 
am: 522787f39a

* commit '522787f39a759cf8af8438641fa8df7470a1b959':
  Documented return value of getRestrictBackgroundStatus().

Change-Id: Ie2e7b14ecc0b574a8776121d3c79c768093ef4f7
 2016-05-16 22:23:44 +00:00
TreeHugger Robot
522787f39a Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev 2016-05-16 22:17:42 +00:00
Vladislav Kaznacheev
a19f5b640c Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev am: a423ec52ac 
am: 943c9f10d2

* commit '943c9f10d284acf5a5f927517fc7c283c473382e':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I6a35f83dcc11704dfbc983bd9004685ecc63b9b5
 2016-05-16 21:31:10 +00:00
Vladislav Kaznacheev
4695fae868 Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev 
am: a423ec52ac

* commit 'a423ec52ac427e5bdbd12aac21ef75eff7d96140':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I5d87956bf0fe48acf66d577d8531e2669ec5b001
 2016-05-16 21:26:09 +00:00
Vladislav Kaznacheev
943c9f10d2 Merge "Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc." into nyc-dev 
am: a423ec52ac

* commit 'a423ec52ac427e5bdbd12aac21ef75eff7d96140':
  Fix inconsistencies in DragEvent.getX/getY behavior and JavaDoc.

Change-Id: I8b704c0cf3b4df430b0f5a322e1cee008e67d113
 2016-05-16 21:26:04 +00:00