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

64995 Commits

Author SHA1 Message Date
Joe Onorato
269f64079b Merge changes If51568c3,Idd434c19 into nyc-dev am: 45165c9373 
am: 6b10cec210

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

Change-Id: Ifc94199cc5ad69af73871cc012aa2dac31b6f67b
 2016-05-18 00:52:32 +00:00
Joe Onorato
6b10cec210 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: Id56c7ee80254eac26132956ef62b83c405a0e2f8
 2016-05-18 00:49:54 +00:00
Hangyu Kuang
c936ef8af2 Merge "Hide HdrCapabilities constructor." into nyc-dev am: c189934573 
am: 993f685045

* commit '993f68504528cffd32b5ab06998ba4bd43c3203b':
  Hide HdrCapabilities constructor.

Change-Id: I19746caa1081f6e37b8c055b1c571618ec38b93b
 2016-05-18 00:49:39 +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
993f685045 Merge "Hide HdrCapabilities constructor." into nyc-dev 
am: c189934573

* commit 'c1899345730ab3c4504cb314b371b4fa43ca0702':
  Hide HdrCapabilities constructor.

Change-Id: Id3e15f6d3f26634dc632caa8f775071516436cd5
 2016-05-18 00:46:35 +00:00
Hangyu Kuang
c189934573 Merge "Hide HdrCapabilities constructor." into nyc-dev 2016-05-18 00:42:55 +00:00
Jorim Jaggi
22507e99ff Merge "Fix threading problems with drawables" into nyc-dev am: 1e09e9826b 
am: e48384c867

* commit 'e48384c8672f53b00b231a7590f45650f1e3f22e':
  Fix threading problems with drawables

Change-Id: Icad4ab1e6f497ab1c549b2d0bb1720c13f6254c2
 2016-05-18 00:33:59 +00:00
Jorim Jaggi
e48384c867 Merge "Fix threading problems with drawables" into nyc-dev 
am: 1e09e9826b

* commit '1e09e9826b24c6d877920b027954e0e861a336a0':
  Fix threading problems with drawables

Change-Id: I06a58a1a9454f9e9c384b9999ef6077cc45cf46f
 2016-05-18 00:28:48 +00:00
TreeHugger Robot
1e09e9826b Merge "Fix threading problems with drawables" into nyc-dev 2016-05-18 00:24:04 +00:00
Adrian Roos
16e54ef2ff Merge "Adjust Notification APIs per API council" into nyc-dev am: 718ba309cf 
am: 3a0f4f4b64

* commit '3a0f4f4b642087138b59a18612be437376652c92':
  Adjust Notification APIs per API council

Change-Id: I20a1e1a542f48532be1b9d71bb5fb2eb0498b395
 2016-05-18 00:17:47 +00:00
Adrian Roos
3a0f4f4b64 Merge "Adjust Notification APIs per API council" into nyc-dev 
am: 718ba309cf

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

Change-Id: I282bb2b6e4718f7b1afb3eb418a8d37deaa457b0
 2016-05-18 00:13:14 +00:00
TreeHugger Robot
718ba309cf Merge "Adjust Notification APIs per API council" into nyc-dev 2016-05-18 00:06:30 +00:00
Jorim Jaggi
ca0cf0f529 Fix threading problems with drawables 
We can't use the same instance on both the main and the background
thread, as this will lead to problems.

Change-Id: Ieec525f028df2d0596667126d8f5004773461517
Fixes: 28745682
 2016-05-17 23:05:38 +00: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
1cc1d13d6e Demote the log in ProcessState.ensureNotDead from a wtf to a warning. 
It's raising alarm bells but there isn't much we can do without a lot
of rewriting inside the ActivityManager.  The only consequence is stats
that are off by a little bit.

Bug: 28581070
Change-Id: If51568c3a708a907ceef6452e7d45599a57454f7
 2016-05-17 15:31:38 -07:00
Joe Onorato
22cfef381d @hide SystemHealthManager.from 
Bug: 28820055
Change-Id: Idd434c196428178e2c66facea36a7e010246611c
 2016-05-17 15:29:51 -07:00
Dianne Hackborn
a648b098f8 Merge "Work on issue #28689719: Runtime restart" into nyc-dev am: 77ad5f1657 
am: ab82de14b1

* commit 'ab82de14b1c6bdf44fa2cac96c37620f0f2319f0':
  Work on issue #28689719: Runtime restart

Change-Id: I9dc025c78a1d58cf46b73141063dda0c9632d502
 2016-05-17 22:21:24 +00:00
Dianne Hackborn
ebfbc39537 Merge "Work on issue #28689719: Runtime restart" into nyc-dev 
am: 77ad5f1657

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

Change-Id: I29e0ef82bed0df030939b198d5a238405dc7486a
 2016-05-17 22:07:01 +00: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
Adrian Roos
31459c3202 Merge "Fix broken MessagingStyle" into nyc-dev am: 8802fd0700 
am: efc9c88d00

* commit 'efc9c88d002263f748716405f7e63becc3685211':
  Fix broken MessagingStyle

Change-Id: Ia328b569b347cb29ddc82b5fcce3efee6bfc7734
 2016-05-17 21:22:39 +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
d91b14d862 Merge "Fix broken MessagingStyle" into nyc-dev 
am: 8802fd0700

* commit '8802fd0700e40ce97555f70db1b02daeece3bfb5':
  Fix broken MessagingStyle

Change-Id: I611823cbd36336828f6ee1b57a6cef3908d8ef6f
 2016-05-17 21:17:10 +00:00
Adrian Roos
8802fd0700 Merge "Fix broken MessagingStyle" into nyc-dev 2016-05-17 21:02:25 +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
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
Felipe Leme
f45186e311 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 
am: 2c6a450fa2

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

Change-Id: I4e19dd2828b8b67fc7b2d2173d77a82d67d53d19
 2016-05-17 18:43:43 +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
Sergio Giro
d498859c4a ZygoteInit: remove extra copy of method 
The method warmUpJcaProviders arrived here from both nyc-dev
and aosp/master, removing duplication.

(cherry picked from commit 57b8a73d0e)

Change-Id: Idbb046ae47d608343ffb5cbf2df8e0c00920c909
 2016-05-17 18:27:56 +01:00