drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
297,916 Commits 1 Branch 0 Tags
Commit Graph

297916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
1432076958 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce am: 21d36dcc91 am: 26450476b8 
am: d7e0fab45c  -s ours

Change-Id: Ibaa14fb3ee89c5ca61e603c9edad5b11ddd0d2a8
 2016-12-02 19:01:32 +00:00
Jeff Sharkey
cf877159f8 DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 am: 2b7584f5b1 am: d8ee1d0fcd 
am: b155106933  -s ours

Change-Id: I128c5baee4f0f4d754467f4f718c5d55c0bc7020
 2016-12-02 19:00:35 +00:00
Jeff Sharkey
37ff2d56bf Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours 
am: aff9286bd6

Change-Id: I4f117247986cfa72156d26af917ba1bae6e9fa9b
 2016-12-02 18:56:56 +00:00
Jeff Sharkey
5267b63325 DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours 
am: 928c09cd8e

Change-Id: Ic470197dcc815e7ecf6b47dfd74ff6f4f74f1804
 2016-12-02 18:56:01 +00:00
Android Build Merger (Role)
2c756a65df Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce am: 21d36dcc91 am: ff703a3fd0 am: dc4cbfa1df -s ours" 2016-12-02 18:55:41 +00:00
Jeff Sharkey
d7e0fab45c Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce am: 21d36dcc91 
am: 26450476b8

Change-Id: I7904c300b0edb08ae4371472c8ea8df8be269e2e
 2016-12-02 18:55:20 +00:00
Jeff Sharkey
48313052ab Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 
am: ef5d241938

Change-Id: I87f7ada782341c052d923fcd0798f58adc1942e2
 2016-12-02 18:55:14 +00:00
Jeff Sharkey
c130d7fd5e Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours 
am: f1085f2dc8

Change-Id: I565994dc5bbfc11b3293cb77aabca77b908a9039
 2016-12-02 18:55:07 +00:00
Jeff Sharkey
30ef1ad5be Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 
am: 34b87d94e4

Change-Id: Ibe93903e3be3f8a6581fc0a3acdc6482542f3204
 2016-12-02 18:55:04 +00:00
Hridya Valsaraju
02c33342c5 Merge "Modify GnssLocationProvider to use Treble Gnss HAL" 2016-12-02 18:55:02 +00:00
Jeff Sharkey
aaf8700f87 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce am: 21d36dcc91 am: ff703a3fd0 
am: dc4cbfa1df  -s ours

Change-Id: I90cec2b594652f98a5c4a2a1b042344efb00b744
 2016-12-02 18:54:58 +00:00
Jeff Sharkey
26f78f5836 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 
am: 44e8914f8b

Change-Id: I81d83d40d322bd6cfa2a6b74286cdfa425a2f951
 2016-12-02 18:54:57 +00:00
Jeff Sharkey
29c335ef2e Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 
am: ef5d241938

Change-Id: I0dc6e8b142d2f4576212281f372a8917efd2e1f4
 2016-12-02 18:54:52 +00:00
Fyodor Kupolov
2e7e09685a Switch isUserUnlocked/isUserRunning to use UMS.mUserStates 
UserManager.isUserUnlocked/isUserRunning now returns state from
UMS.mUserStates that is pushed from ActivityManager.

Test: manual
Bug: 33232933
Bug: 28957340
Change-Id: Ic5f56d7d577bc336acd2bf44fab7f74feac4f7b3
 2016-12-02 10:54:31 -08:00
Jeff Sharkey
b155106933 DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 am: 2b7584f5b1 
am: d8ee1d0fcd

Change-Id: Ie8a8213307f8f85b00f2232cf047a8d8563bd859
 2016-12-02 18:54:16 +00:00
Jeff Sharkey
4ad177829a DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 
am: 74b36307a0

Change-Id: I6e5a7fbc4dfe0f207f6787ef5fbba93b0296e1b1
 2016-12-02 18:53:58 +00:00
Jeff Sharkey
bf9a60106b DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f 
am: b4638e2d88

Change-Id: Iefbb713e624ec639205d51f560045a0cb5cf3dbc
 2016-12-02 18:53:58 +00:00
Jeff Sharkey
8b5fa0c0c0 DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours 
am: 32af84320b

Change-Id: I73fe93944c2c2aebca02ca85d441905c2075bc65
 2016-12-02 18:53:57 +00:00
Jeff Sharkey
94b6048c4a DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d 
am: 9e7bd59457

Change-Id: Ia76c61296501cede3473ac743583643135820ad4
 2016-12-02 18:53:57 +00:00
Jeff Sharkey
0040d4f71c DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d 
am: 9e7bd59457

Change-Id: I83f64b1e31c1d598a1db53af45cbf2563b3eae57
 2016-12-02 18:53:56 +00:00
Jeff Sharkey
c2714dda32 DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 am: 2b7584f5b1 am: 37d3eecbac 
am: 1fb6b55178  -s ours

Change-Id: If4048fee4befc1073db9a195dc0d7795b0272bee
 2016-12-02 18:53:55 +00:00
Jeff Sharkey
aeeb9c8470 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 
am: 4610805746  -s ours

Change-Id: If9504039b5ec449edb2fb1e9f429a3d568a2aabf
 2016-12-02 18:47:08 +00:00
Jeff Sharkey
34b87d94e4 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 
am: 45b6a52225

Change-Id: Ie06f966f3b526c56de139a81edc7d8ccd5be074c
 2016-12-02 18:46:35 +00:00
Jeff Sharkey
ef5d241938 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e 
am: 26e6918800

Change-Id: I8b1bf2889bface1c6d8aad7c92b55c301059d6f5
 2016-12-02 18:46:35 +00:00
Jeff Sharkey
dc4cbfa1df Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce am: 21d36dcc91 
am: ff703a3fd0

Change-Id: Ie3a7b042909fcbb0f02d7acc590d431729e5cc31
 2016-12-02 18:46:35 +00:00
Jeff Sharkey
e0fe3201cb DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a 
am: a07bcbcc27  -s ours

Change-Id: I9d320f3e2c77712757c17f1609c62c325cca9082
 2016-12-02 18:45:38 +00:00
Jeff Sharkey
9e7bd59457 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b 
am: ad04786a3d

Change-Id: I7272c2bab70ff8b6efd44c35f0131e57f6603748
 2016-12-02 18:45:38 +00:00
Jeff Sharkey
1fb6b55178 DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 am: 2b7584f5b1 
am: 37d3eecbac

Change-Id: Ia5c4ff4a6c26aa90d2fa754a73de44b4694cd569
 2016-12-02 18:45:31 +00:00
Jeff Sharkey
b4638e2d88 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb 
am: b88d8dc58f

Change-Id: I9587d5abd8d0525e3b098a5f9662e5edbc1f9c12
 2016-12-02 18:45:30 +00:00
Jeff Sharkey
aff9286bd6 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 
am: 920b02a94f  -s ours

Change-Id: I3c2b9ba49785b40df3960fac4ffb17204cab063a
 2016-12-02 18:40:25 +00:00
Jeff Sharkey
928c09cd8e DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa 
am: a1d1ecbe05  -s ours

Change-Id: I6d4f8a29537e19545bf94a886aecea8ba05a6de7
 2016-12-02 18:39:20 +00:00
Jeff Sharkey
45b6a52225 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours 
am: b685f719f1

Change-Id: If5744f0e5554877450b5e75f304fe857366de72c
 2016-12-02 18:38:22 +00:00
Jeff Sharkey
f1085f2dc8 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 
am: a7efe16fe1  -s ours

Change-Id: I17b84f1e8d8432292568c0adb2b3d89563a72b50
 2016-12-02 18:38:01 +00:00
Jeff Sharkey
4610805746 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 
am: 471812ad04

Change-Id: Ida67c1a00ac95109c647eb182af7628544bbb739
 2016-12-02 18:37:58 +00:00
Jeff Sharkey
44e8914f8b Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 
am: a80cbeeee2

Change-Id: I6b67d2f65208559d9cb5cd79bfec5fbc506abcad
 2016-12-02 18:37:57 +00:00
Jeff Sharkey
26450476b8 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce 
am: 21d36dcc91

Change-Id: I59845d27d897e3c7e8e4c82b01cab6bc1fbf70bf
 2016-12-02 18:37:51 +00:00
Jeff Sharkey
26e6918800 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d 
am: 414334595e

Change-Id: I8af2c8895deb6abc89c7394809b3e2f24c41fa65
 2016-12-02 18:37:43 +00:00
Jeff Sharkey
ff703a3fd0 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce 
am: 21d36dcc91

Change-Id: Ib2a788b0ebb819ca7b51a668ee9a746fd6c02767
 2016-12-02 18:37:40 +00:00
Jeff Sharkey
b88d8dc58f DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours 
am: 3f0e7465cb

Change-Id: Iaa85b6d22c436ff2c46eafe500a74448403c5886
 2016-12-02 18:36:43 +00:00
Jeff Sharkey
a07bcbcc27 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd 
am: 7340749c2a

Change-Id: Iabb21a28a245d36f2247eaace573bdfd134f382d
 2016-12-02 18:36:40 +00:00
Jeff Sharkey
d8ee1d0fcd DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 
am: 2b7584f5b1

Change-Id: I762e09539e99d1cb8b6fd810992b27255774060d
 2016-12-02 18:36:38 +00:00
Jeff Sharkey
74b36307a0 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 
am: 190e20c2b5

Change-Id: Ib8d8b2b97b03acdd56e2cbdada404fb25535d234
 2016-12-02 18:36:38 +00:00
Jeff Sharkey
37d3eecbac DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 
am: 2b7584f5b1

Change-Id: I1a74f306a4d9858a4e9726cd53ab544d28542522
 2016-12-02 18:36:36 +00:00
Jeff Sharkey
ad04786a3d DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 
am: bdfb26ac3b

Change-Id: I93ab9555383689078ae6c08534619e8f38a47aaf
 2016-12-02 18:36:34 +00:00
Jeff Sharkey
32af84320b DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 
am: 792d49dfb5  -s ours

Change-Id: I50ab47cb03b65cc8be78c9a139561e4befbb1a95
 2016-12-02 18:36:33 +00:00
Jeff Sharkey
920b02a94f Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours 
am: ce477912a2

Change-Id: I1f05c5204e6ba49a95a8b21cb457b04fe6738cb0
 2016-12-02 18:30:18 +00:00
Jeff Sharkey
a1d1ecbe05 DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours 
am: 9277cce7fa

Change-Id: I5cdc35759ad40566c02db6ee725c199ae255b5b8
 2016-12-02 18:29:19 +00:00
Seigo Nonaka
0ec4f416ff Allow only U+0020..U+007E characters for axis tag. 
CSS Font4 only allows U+0020..U+007E characters for tag string.
Reject outside of this range.

Bug: 33062398
Test: am instrument -w -e class android.graphics.VariationParserTest \
com.android.frameworks.graphicstests/android.test.InstrumentationTestRunner
Change-Id: Ia119151bc67caebfdaacda17aa3ee261a9e5d872
 2016-12-02 18:24:00 +00:00
Jeff Sharkey
b685f719f1 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev 
am: 0be332852e  -s ours

Change-Id: Ia1266b2276eb2219fbd19aff20985d278bd58fac
 2016-12-02 18:20:10 +00:00
Jeff Sharkey
3f0e7465cb DO NOT MERGE: Check provider access for content changes. 
am: 956bc433dc  -s ours

Change-Id: I36a6cf33803635becf8ff794bb8f4e02ba5cd1d4
 2016-12-02 18:20:06 +00:00