Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,107 Commits 3 Branches 0 Tags
b7181150c42da5d5edcf45fad84e8a7fb2be462b
Commit Graph

251107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gina Dimino
b7181150c4 Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev 
am: d06520a488

Change-Id: Ice3bd7016d11e4f8f50c09e7b6ba3cb613911a52
 2016-06-16 21:08:17 +00:00
Yi Kong
e8f9aa9d5d Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\" into stage-aosp-master 
am: e1cf90c6eb

Change-Id: Ib300b8d9ca4082abeebe3530c74537969330e1a7
 2016-06-16 21:02:40 +00:00
Przemyslaw Szczepaniak
dd094522bd Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c 
am: 9f4ad4fbb6

Change-Id: I18db994066406214705f36f2e10f0d39dcc279df
 2016-06-16 21:02:39 +00:00
Gina Dimino
d06520a488 Merge "Docs: Suppress errors in SystemApi Build Bug: 28427390" into nyc-dev 2016-06-16 21:02:14 +00:00
Andreas Gampe
e1cf90c6eb Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92" into stage-aosp-master 2016-06-16 20:59:43 +00:00
Yi Kong
6635de0108 Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92 
(cherry picked from commit ade5c7c893)

Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
 2016-06-16 20:52:17 +00:00
Andrew Solovay
0d21553bd2 Merge \"docs: Minor update to DP4 release notes\" into nyc-dev 
am: 5a3a66a253

Change-Id: Ia2d95b95055115cc7c71333ded4a140d7873b15b
 2016-06-16 20:51:51 +00:00
Przemyslaw Szczepaniak
9f4ad4fbb6 Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c 
test-current.txt update

Bug: 28666126

(cherry picked from commit aa021e854e)

Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
 2016-06-16 20:51:23 +00:00
TreeHugger Robot
5a3a66a253 Merge "docs: Minor update to DP4 release notes" into nyc-dev 2016-06-16 20:47:04 +00:00
Yujie Qin
d09b020ce5 Merge \"Report error correctly for the implementation of StreamInterface::GetData()\" into nyc-dev 
am: e09415344d

Change-Id: Id85ebdb2541c6145da39cf20684f85728f2ba0b6
 2016-06-16 20:05:17 +00:00
Adrian Roos
ac52bbec1f Merge \"Fix unresponsive brightness slider after font size change\" into nyc-dev 
am: db81dd9d2e

Change-Id: If6af6f296d86ab8856e04ed1707bd61d58414d78
 2016-06-16 20:05:13 +00:00
Yujie Qin
e09415344d Merge "Report error correctly for the implementation of StreamInterface::GetData()" into nyc-dev 2016-06-16 19:48:19 +00:00
Adrian Roos
db81dd9d2e Merge "Fix unresponsive brightness slider after font size change" into nyc-dev 2016-06-16 19:25:49 +00:00
Steve McKay
be8b6e6164 Merge \"Include cause when reporting errors.\" into nyc-dev 
am: 60585e6c54

Change-Id: I9a0ba14d358fedd7287e4bd0c5710953a9f21d27
 2016-06-16 19:18:28 +00:00
TreeHugger Robot
60585e6c54 Merge "Include cause when reporting errors." into nyc-dev 2016-06-16 19:14:06 +00:00
Felipe Leme
f2326e947c Merge \"Check extra type before blindingly casting to Parcelable.\" into nyc-dev 
am: 47c3afa10b

Change-Id: I4cb74a467a10ee3d38db91fde077263179bf9359
 2016-06-16 18:53:47 +00:00
TreeHugger Robot
47c3afa10b Merge "Check extra type before blindingly casting to Parcelable." into nyc-dev 2016-06-16 18:47:51 +00:00
Dianne Hackborn
403e103eb2 Merge \"Fix issue #29371078: Foreground jobs should not count...\" into nyc-dev 
am: 47cfac6803

Change-Id: I1de87ba1e5d14f5f9bd66cde733517e3fc5e71f3
 2016-06-16 18:43:37 +00:00
Dianne Hackborn
47cfac6803 Merge "Fix issue #29371078: Foreground jobs should not count..." into nyc-dev 2016-06-16 18:39:03 +00:00
Andrew Solovay
02e2cb979e docs: Minor update to DP4 release notes 
Added a new section from Dirk, with a couple of gotchas for people
updating from API level ≤22 to 24.

See first comment for doc stage location.

Change-Id: I237e9efac75b9c1e0fbeecf362dbc0de7c958c60
 2016-06-16 11:15:39 -07:00
Gustav Sennton
4a352d2c41 Merge \"Support using uninstalled WebView packages as WebView implementation.\" into nyc-dev 
am: e25c8532b6

Change-Id: Idf2b200364c7b760f82f5138b7aba0bd63bcf12b
 2016-06-16 17:47:21 +00:00
Steve McKay
56d950c5e6 Include cause when reporting errors. 
Bug: 29191892
Change-Id: I5f904da3a8564ec68ca634c28e3eda7f496a5c1c
 2016-06-16 10:41:50 -07:00
Gustav Sennton
e25c8532b6 Merge "Support using uninstalled WebView packages as WebView implementation." into nyc-dev 2016-06-16 17:40:10 +00:00
Felipe Leme
75aa534d3a Check extra type before blindingly casting to Parcelable. 
BUG: 29402928
Change-Id: If1729b8a4fcde724372b0a23cfae723a5d9b4faa
 2016-06-16 10:25:06 -07:00
Yi Kong
b72fa52282 Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" am: 1850851670 
am: f5bdd8eae6

Change-Id: Iea16189bfbce1b11fa4a91501daba94c2c83a380
 2016-06-16 17:08:09 +00:00
Yi Kong
f5bdd8eae6 Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\" 
am: 1850851670

Change-Id: I6997e3b34d87cb091be99318ea1743c972ca1c84
 2016-06-16 17:02:37 +00:00
Dan Willemsen
fd1854cdfa resolve merge conflicts of 20d55a7 to stage-aosp-master 
am: 5f551b3fdc

Change-Id: I327901f4bcca937a8376c1a6d604d7293828b0c9
 2016-06-16 17:01:55 +00:00
Dan Willemsen
5f551b3fdc resolve merge conflicts of 20d55a7 to stage-aosp-master 
Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59
 2016-06-16 09:54:28 -07:00
Todd Kennedy
e084a08ff5 Merge \"Make sure we\'re locked\" into nyc-dev 
am: 32d67fab83

Change-Id: Iff90d36636b01542ed8a7e088f403b6554cbd91a
 2016-06-16 16:34:11 +00:00
Todd Kennedy
32d67fab83 Merge "Make sure we're locked" into nyc-dev 2016-06-16 16:22:54 +00:00
Yi Kong
53cf79e185 Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92" into nyc-dev-plus-aosp 2016-06-16 16:17:49 +00:00
Yi Kong
1850851670 Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92" 2016-06-16 16:16:00 +00:00
Yi Kong
ade5c7c893 Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92 
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
(cherry picked from commit af823e0ebf)
 2016-06-16 17:14:36 +01:00
Przemyslaw Szczepaniak
7d09db2830 Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c 
test-current.txt update

Bug: 28666126
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
(cherry picked from commit aa021e854e)
 2016-06-16 15:58:27 +00:00
Treehugger Robot
20d55a7779 Merge "Remove unused link to libcutils" 2016-06-16 15:56:50 +00:00
Victor Chang
9feb501659 Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev 
am: 6437205648

Change-Id: Id19fe2488406a3891cd433d8b1e9273a28b48fbb
 2016-06-16 15:21:12 +00:00
Victor Chang
6437205648 Merge "Fix that work apps settings page crash after changing work profile to use separated lock" into nyc-dev 2016-06-16 15:13:34 +00:00
Gustav Sennton
0df2c5566a Support using uninstalled WebView packages as WebView implementation. 
A package can be uninstalled for the system user but still be installed
on the device. Currently, we do not use such a package as WebView
implementation which means we fall back to using the fallback WebView
package.
However, if the fallback package is not valid (because it needs to be
updated first) loading WebView will fail.

With this change we fetch allow the fetching of information from
packages that are uninstalled for the system user so that we can still
load WebView when the only valid WebView provider is uninstalled for the
system user.

Also listen to package additions/changes/removals for all users -
otherwise we won't notice when a package becomes replaced if it was
already uninstalled for the system user.

Bug: 29321185
Change-Id: Ia23c4493844877aea1b4eab7e666fd37540c4f97
 2016-06-16 15:45:45 +01:00
Todd Kennedy
3d5604dc90 Make sure we're locked 
Before calling a method ending with LPw, we need to have the mPackages lock.
Make sure we do that.

Also, ditch the iterator for traversing an ArraySet.

Bug: 29356333
Change-Id: I67df971f2961b577f31153cef46fb153458d6965
 2016-06-16 07:08:09 -07:00
Yi Kong
af823e0ebf Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92 
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
 2016-06-16 14:29:41 +01:00
Joachim Sauer
69147f24ae Merge \\"API updated for ICU4J 57.1\\" am: 4861329f57 
am: 438dc91a41

Change-Id: I16a88e2346435b60cc7844784f30be82a775bf5d
 2016-06-16 13:09:12 +00:00
Fredrik Roubert
438dc91a41 Merge \"API updated for ICU4J 57.1\" 
am: 4861329f57

Change-Id: I28a8fe77f81a0cb24ed7044046c06677b44c812c
 2016-06-16 13:03:50 +00:00
Joachim Sauer
4861329f57 Merge "API updated for ICU4J 57.1" 2016-06-16 12:38:30 +00:00
Przemyslaw Szczepaniak
720f31e238 Merge \\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\" am: 47ef3bf172 
am: d37e23c50c

Change-Id: I852b8efb010fecf7079679694c45d6d8300ea408
 2016-06-16 12:38:20 +00:00
Przemyslaw Szczepaniak
d37e23c50c Merge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\" 
am: 47ef3bf172

Change-Id: I15352fb15ffb6d427ddf92cb084c2cfc4c0f8368
 2016-06-16 12:33:21 +00:00
Przemyslaw Szczepaniak
47ef3bf172 Merge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c" 2016-06-16 12:26:51 +00:00
Przemyslaw Szczepaniak
a82f0622f1 Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c 
Bug: 28666126
Change-Id: I52b859a5504536413f74c1e27d3eb7f1f930dc20
 2016-06-16 13:07:31 +01:00
Ricky Wai
c42f5c4410 Merge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev 
am: 43f6a45e7e

Change-Id: I061297e1cd98535f666141ea7709d97c3b490f60
 2016-06-16 10:38:46 +00:00
Ricky Wai
43f6a45e7e Merge "Add permission checking on service calls in LockSettingsService" into nyc-dev 2016-06-16 10:33:23 +00:00
Bill Yi
1ddd928abf Merge \"Import translations. DO NOT MERGE\" into nyc-dev 
am: d58da1be76  -s ours

Change-Id: I892cb57187ad5229701d24112490ac48182c5319
 2016-06-16 10:26:34 +00:00