Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,844 Commits 3 Branches 0 Tags
5ac773c8f7a6edef2d72fb9ce1b2fd8a90740978
Commit Graph

57903 Commits

Author SHA1 Message Date
Sudheer Shanka
db9d529499 Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev 
am: 0d902adbbc

* commit '0d902adbbc729f87f94fd70d9a6331e551108bc0':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: Iaad04447c2fffd0f6b80c22bfea576e5d2b28856
 2016-05-18 17:14:29 +00:00
TreeHugger Robot
0d902adbbc Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev 2016-05-18 17:09:46 +00:00
Robert Sesek
a83b4cfc74 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 
am: f45bc095c6

* commit 'f45bc095c6cef916f5f801fb320b3413f0fc099a':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: Ie16d11c4aaa515a570b8b717241d556903198d24
 2016-05-18 15:32:18 +00:00
Robert Sesek
f45bc095c6 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 2016-05-18 15:25:41 +00:00
Jim Miller
0991ba5b01 Merge "Add fingerprint navigation to enable pulling down the statusbar" into nyc-mr1-dev 2016-05-18 02:55:10 +00:00
Yohei Yukawa
13fa6b7c48 Merge "Move LocaleList to avoid layering violation." into nyc-dev 
am: 31884efd13

* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
  Move LocaleList to avoid layering violation.

Change-Id: I45e9b7e834d2c5e515eb6c60885296358e7d786e
 2016-05-18 02:18:29 +00:00
Yohei Yukawa
31884efd13 Merge "Move LocaleList to avoid layering violation." into nyc-dev 2016-05-18 02:14:26 +00:00
Jim Miller
f4c0a13170 Add fingerprint navigation to enable pulling down the statusbar 
Change-Id: If0584358fd615ebd9df11614c662f4f287abf5c4
 2016-05-17 18:11:52 -07:00
Chris Craik
1edc049919 Merge "Document that SurfaceView is synchronous in N" into nyc-dev 
am: 0cfbb7643e

* commit '0cfbb7643ef81cc8d1fd72bfe7c651d0e5e04949':
  Document that SurfaceView is synchronous in N

Change-Id: I1e4a36d64be663103c3150c86a75e2baa51fa4c4
 2016-05-18 00:55:16 +00:00
Andrii Kulian
88a2a7be72 Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev 
am: 47aa3f61ac

* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I588355b4e5ac95e4f872bf06d77fd3d3346cddac
 2016-05-18 00:55:12 +00:00
Joe Onorato
6f04fef272 Merge changes If51568c3,Idd434c19 into nyc-dev 
am: 45165c9373

* commit '45165c9373f1bf2dbe0c3f11b271daa24414ea35':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Ibb36bb8d2c32c0fa8ec85eb093b8281f349158fb
 2016-05-18 00:52:11 +00:00
TreeHugger Robot
0cfbb7643e Merge "Document that SurfaceView is synchronous in N" into nyc-dev 2016-05-18 00:51:57 +00:00
Andrii Kulian
47aa3f61ac Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev 2016-05-18 00:51:17 +00:00
TreeHugger Robot
45165c9373 Merge changes If51568c3,Idd434c19 into nyc-dev 
* changes:
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from
 2016-05-18 00:46:47 +00:00
Hangyu Kuang
8f3e14bc92 Merge "Hide HdrCapabilities constructor." into nyc-dev 
am: c189934573

* commit 'c1899345730ab3c4504cb314b371b4fa43ca0702':
  Hide HdrCapabilities constructor.

Change-Id: I55e8a10631507c6022a68467401f66ca70cfa0be
 2016-05-18 00:46:31 +00:00
Hangyu Kuang
c189934573 Merge "Hide HdrCapabilities constructor." into nyc-dev 2016-05-18 00:42:55 +00:00
Adrian Roos
6cb72ee2eb Merge "Adjust Notification APIs per API council" into nyc-dev 
am: 718ba309cf

* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
  Adjust Notification APIs per API council

Change-Id: Ic85fdd92c691f7b30cd73a9e1a7f147fcf55c3c5
 2016-05-18 00:13:07 +00:00
TreeHugger Robot
718ba309cf Merge "Adjust Notification APIs per API council" into nyc-dev 2016-05-18 00:06:30 +00:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation. 
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
 2016-05-17 16:42:58 -07:00
Chris Craik
6ee192f4e9 Document that SurfaceView is synchronous in N 
bug:28821062

Change-Id: I1c17949d93de3d1f89c504fc061f7d20dd451a4d
 2016-05-17 16:17:25 -07:00
Robert Sesek
55b2d11cd3 Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE. 
Bug: 28775488
Change-Id: Ic0473d3664671f0ac5df8412f61ca8c1d029887f
 2016-05-17 18:53:13 -04:00
Adrian Roos
96b7e20ba6 Adjust Notification APIs per API council 
Also fixes a slight bug where a CharSequence extra
was retrieved as a string.

Change-Id: I8a40ab1934b8a20355c3cd4afd66a4a7b91fb517
Fixes: 28775580
Fixes: 28775582
 2016-05-17 15:35:33 -07:00
Joe Onorato
22cfef381d @hide SystemHealthManager.from 
Bug: 28820055
Change-Id: Idd434c196428178e2c66facea36a7e010246611c
 2016-05-17 15:29:51 -07:00
Dianne Hackborn
ab82de14b1 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 
am: 77ad5f1657

* commit '77ad5f1657a8bef6b28f69f9bd8a2d1978c88a57':
  Work on issue #28689719: Runtime restart

Change-Id: Ic44a4f56be67e3a50932d6bfbb58cdca6536e501
 2016-05-17 22:06:57 +00:00
Dianne Hackborn
77ad5f1657 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 2016-05-17 21:58:21 +00:00
Hangyu Kuang
1e7d1aa6a6 Hide HdrCapabilities constructor. 
Bug:25684127
Change-Id: I1a30ab3c162d8891c8aea1447757c85942033a0d
 2016-05-17 14:21:01 -07:00
Adrian Roos
efc9c88d00 Merge "Fix broken MessagingStyle" into nyc-dev 
am: 8802fd0700

* commit '8802fd0700e40ce97555f70db1b02daeece3bfb5':
  Fix broken MessagingStyle

Change-Id: I31975da4749c801a8fbf3bfffb666daa69c9c2af
 2016-05-17 21:17:33 +00:00
Adrian Roos
8802fd0700 Merge "Fix broken MessagingStyle" into nyc-dev 2016-05-17 21:02:25 +00:00
Andrii Kulian
5c96320e40 DO NOT MERGE Hide decor caption APIs 
Hiding the APIs for now since we're not releasing freeform yet and it's
better not to expose them now in case we'll decide to change them later.

Bug: 28774476
Change-Id: Ic2de33c5a611a515fc1c72535587ebf2e0a03a7f
 2016-05-17 20:56:24 +00:00
Dianne Hackborn
2675616719 Work on issue #28689719: Runtime restart 
There are few paths I can see to get a null intent down into
the framework at this point.  Add in some checks and reports
at those places to mitigate and report such problems.

Change-Id: If235bf342558321d3fabe9363fcebb2bcea18df1
 2016-05-17 13:40:44 -07:00
Sudheer Shanka
93f8fd714a Update RestrictedLockUtils to use UM.getUserRestrictionSource. 
Bug: 28269827
Change-Id: Ib4a1441b71986ca6637a9236136b60e18dbc1643
 2016-05-17 13:27:27 -07: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
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
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
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
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
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
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
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
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
TreeHugger Robot
b406dd20ee Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev 2016-05-17 00:51:41 +00:00