Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
243,290 Commits 3 Branches 0 Tags
be9194115bb031d00a0b4aa5d0b8582fbf611f29
Commit Graph

7980 Commits

Author SHA1 Message Date
Christopher Tate
6c68a45108 Merge "API review: WallpaperManager" into nyc-dev am: 9c4ec06 
am: e6dc55c

* commit 'e6dc55c327cb99e8dede71a25fedd81ac694bd6c':
  API review: WallpaperManager

Change-Id: I7817ac377a000eca4444101ec86b22e65b89148a
 2016-03-31 19:37:11 +00:00
Christopher Tate
e6dc55c327 Merge "API review: WallpaperManager" into nyc-dev 
am: 9c4ec06

* commit '9c4ec06988642e24f9cf9a0dd79d777526b0a0a6':
  API review: WallpaperManager

Change-Id: If59d4cb7bc609fee139e0874dd70efc451367522
 2016-03-31 19:33:49 +00:00
Chris Tate
9c4ec06988 Merge "API review: WallpaperManager" into nyc-dev 2016-03-31 19:24:42 +00:00
Robin Lee
68d91c0a81 Merge "API to approve CA certificates" into nyc-dev am: f1fe782 
am: 8d0373c

* commit '8d0373c8fdeabbe90df4d78652cf03c8f9d0fd9f':
  API to approve CA certificates

Change-Id: I86bf99827083c57bde7b14704e942d19ecc94b87
 2016-03-31 18:34:38 +00:00
Robin Lee
8d0373c8fd Merge "API to approve CA certificates" into nyc-dev 
am: f1fe782

* commit 'f1fe782e912d3feed9cded8fb80b179c4ee5d09c':
  API to approve CA certificates

Change-Id: Ia84876f692a79d159cbfadd5888d73557e111e37
 2016-03-31 18:31:32 +00:00
Robin Lee
f1fe782e91 Merge "API to approve CA certificates" into nyc-dev 2016-03-31 18:26:32 +00:00
Joe Onorato
f518af881e Merge "Include process state in association tracking" into nyc-dev am: d0f83b7 
am: d1d3cfb1

* commit 'd1d3cfb1b6c150825a350f8354aee53a76506111':
  Include process state in association tracking

Change-Id: I6153f90327964ce67be3010a1026ece4b47d545c
 2016-03-31 17:55:12 +00:00
Joe Onorato
d1d3cfb1b6 Merge "Include process state in association tracking" into nyc-dev 
am: d0f83b7

* commit 'd0f83b7bcadc6cfa4f39ee99ea96e48591fd6539':
  Include process state in association tracking

Change-Id: Ifff023a305ed76b15966ef30812961f528e9b434
 2016-03-31 17:49:18 +00:00
Joe Onorato
d0f83b7bca Merge "Include process state in association tracking" into nyc-dev 2016-03-31 17:09:24 +00:00
Robin Lee
2f7e1e487c API to approve CA certificates 
Bug: 18224038
Change-Id: Id928872cd70dac5a5ecfdcd52150fe6dea544e3b
 2016-03-31 18:06:44 +01:00
Andrei Stingaceanu
51bc9d8e30 Merge "AfW - suspend apps - API polish" into nyc-dev am: aa60469 
am: 4c0fc48

* commit '4c0fc48aa739cb7b908ac48eb7a500abe487fdbd':
  AfW - suspend apps - API polish

Change-Id: I5b244f14d7ceaec9654f10dcdf33a3ab9d7656bc
 2016-03-31 15:40:28 +00:00
Andrei Stingaceanu
4c0fc48aa7 Merge "AfW - suspend apps - API polish" into nyc-dev 
am: aa60469

* commit 'aa604694450539b4c99901b0714efaa79db3c87d':
  AfW - suspend apps - API polish

Change-Id: I0bbb5d6ddc8f81d70960d179cf5f37f913ccddd8
 2016-03-31 15:36:58 +00:00
Andrei Stingaceanu
aa60469445 Merge "AfW - suspend apps - API polish" into nyc-dev 2016-03-31 10:57:58 +00:00
Michal Karpinski
f418f53ca6 Merge "Adjusting javadocs for process logging" into nyc-dev am: 31f59f1 
am: 2d884a2

* commit '2d884a207b4dfc46f37acde4765cca987369474f':
  Adjusting javadocs for process logging

Change-Id: Ifa3d018c8eb7a1c0e8012998a98bd4852b33a382
 2016-03-31 10:05:40 +00:00
Michal Karpinski
2d884a207b Merge "Adjusting javadocs for process logging" into nyc-dev 
am: 31f59f1

* commit '31f59f1106824594ab8d5d48391b785b8687c4b0':
  Adjusting javadocs for process logging

Change-Id: Ia37bd42b2f7dffd71d08515a5d8b93771effbf57
 2016-03-31 10:02:57 +00:00
Michal Karpinski
31f59f1106 Merge "Adjusting javadocs for process logging" into nyc-dev 2016-03-31 09:56:24 +00:00
Jeff Sharkey
e78e7ff560 Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev am: 4afe32d 
am: baa9a1a

* commit 'baa9a1a5d5253f952c79a9c215db14244afe2622':
  Keep COLUMN_LOCAL_URI working for now.

Change-Id: I4247f2fe6535435b0425bb7c265fbb9b0040d50b
 2016-03-31 03:53:11 +00:00
Jeff Sharkey
baa9a1a5d5 Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev 
am: 4afe32d

* commit '4afe32d4934cc89371dce05d669e9b1bdbf14449':
  Keep COLUMN_LOCAL_URI working for now.

Change-Id: I6d89ede091d3bc6b1620abd2638d28273be5feed
 2016-03-31 03:50:25 +00:00
Jeff Sharkey
4afe32d493 Merge "Keep COLUMN_LOCAL_URI working for now." into nyc-dev 2016-03-31 03:46:14 +00:00
Sudheer Shanka
994651ff69 Merge "Return null value if getActiveAdminUncheckedLocked returns null." into nyc-dev am: d2a968f 
am: 81c6380

* commit '81c6380114f30e2ed97ae360c87fd55deb05d8b9':
  Return null value if getActiveAdminUncheckedLocked returns null.

Change-Id: If85a5c57df9619ff6926ec3f2f0ed7727df54b47
 2016-03-31 02:23:05 +00:00
Andrii Kulian
e61d037a87 Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev am: ac94586 
am: b6ba05f

* commit 'b6ba05ffb07f5785c24de21152405ee0bd92bf3c':
  Refactor usages of Picture In Picture and Multi Window (1/4)

Change-Id: I24d558529fa14f780c714d26a834306057cf7b2b
 2016-03-31 02:22:57 +00:00
Sudheer Shanka
81c6380114 Merge "Return null value if getActiveAdminUncheckedLocked returns null." into nyc-dev 
am: d2a968f

* commit 'd2a968f9c31ba1864bc514bb88a9a939508fe794':
  Return null value if getActiveAdminUncheckedLocked returns null.

Change-Id: I2767b95af01a0ef78bf1c216579b81ee705e1468
 2016-03-31 02:17:16 +00:00
Andrii Kulian
b6ba05ffb0 Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev 
am: ac94586

* commit 'ac945867145c571506a211ccb0a87a3402c4d745':
  Refactor usages of Picture In Picture and Multi Window (1/4)

Change-Id: I34a274c3eca15546d7be85fbb30ac072ff03db7f
 2016-03-31 02:17:08 +00:00
Jeff Sharkey
281c182cb8 Keep COLUMN_LOCAL_URI working for now. 
Bug: 26515039
Change-Id: I48f3ef90443b01fb75a3852e5cfdd83a9bbcac0f
 2016-03-30 19:46:42 -06:00
Sudheer Shanka
d2a968f9c3 Merge "Return null value if getActiveAdminUncheckedLocked returns null." into nyc-dev 2016-03-31 01:14:21 +00:00
Andrii Kulian
ac94586714 Merge "Refactor usages of Picture In Picture and Multi Window (1/4)" into nyc-dev 2016-03-31 00:57:42 +00:00
Sudheer Shanka
549b969280 Return null value if getActiveAdminUncheckedLocked returns null. 
- Split per user version of getUserRestrictions into a separate method
  in DPMS and make the per-user version return null if the admin
  parameter is not a valid one.
- Update isAccessibilityServicePermittedByAdmin and
  isInputMethodPermittedByAdmin to return false if the admin parameter
  is not a valid one.

Bug: 27909087
Change-Id: I6f4cae6552cbfe02dc4a92b04eeeddf0314e0974
 2016-03-30 17:12:07 -07:00
Joe Onorato
05c9ecc08a Include process state in association tracking 
Bug: 26165863
Change-Id: Ic1f3237d85dd9f9b55a412bc8609e60e6c2f3fd2
 2016-03-30 16:55:25 -07:00
Lorenzo Colitti
f545e52e95 Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev am: 7d4ed2f 
am: 882f62d

* commit '882f62dd1a49bdc9ed5a7f13423de0075911d70a':
  Avoid null app context in StaticApplicationContextServiceFetcher.

Change-Id: I201c7099b71fed9edc037ce1d5738086aab35d28
 2016-03-30 23:12:11 +00:00
Lorenzo Colitti
882f62dd1a Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev 
am: 7d4ed2f

* commit '7d4ed2f5aba19a6b1efb7dc0772f7debfa8a7299':
  Avoid null app context in StaticApplicationContextServiceFetcher.

Change-Id: I86ee864b37109cac50dacbd34685c9c000fb763b
 2016-03-30 23:09:25 +00:00
Lorenzo Colitti
7d4ed2f5ab Merge "Avoid null app context in StaticApplicationContextServiceFetcher." into nyc-dev 2016-03-30 23:03:18 +00:00
Adam Lesinski
bbc56794e4 Merge "Allow multiple Resources associated with an Activity" into nyc-dev am: d17f96a 
am: 7baa521

* commit '7baa5212c24f283fad1eda53d6ef0fd01f1501db':
  Allow multiple Resources associated with an Activity

Change-Id: I4aa2b500028ef733e9ed9708447743f4771ae781
 2016-03-30 22:39:54 +00:00
Adam Lesinski
7baa5212c2 Merge "Allow multiple Resources associated with an Activity" into nyc-dev 
am: d17f96a

* commit 'd17f96ae007179007765c0f75b6bffb13c9285cb':
  Allow multiple Resources associated with an Activity

Change-Id: I34dd24af289d3384deb72cf66ba076b2f7cfd2e8
 2016-03-30 22:37:35 +00:00
Christopher Tate
edf7d04003 API review: WallpaperManager 
- Rename FLAG_SET_* to simply FLAG_*
- Improve documentation

Bug 27365822

Change-Id: I10e85aeaa462a8ae092938c0ccd55d171f02c20a
 2016-03-30 14:32:00 -07:00
Adam Lesinski
7f3f499887 Allow multiple Resources associated with an Activity 
Previously it was assumed that one Resources object per Activity would be fine.
This proved to be incorrect, as methods like Context#createConfigurationContext()
expect to create a new Resources object that gets updated whenever the Activity Resources
get updated.

To fix this issue, there exists a master override configuration for each Activity. Subsequent
Resources created for an Activity will be based off that master override configuration, and
will be updated accordingly.

Bug:27644297
Bug:27604953
Change-Id: Idb3d851f55ee7981eec4e3fe28e2ea8d55f1192d
 2016-03-30 14:27:11 -07:00
Seigo Nonaka
969b3c4f11 Merge "Fix incorrect initial locale negotiation." into nyc-dev am: 48d8a39 
am: 0ab71b6

* commit '0ab71b606dd2dcb67466467b1220702d3cdbe1a2':
  Fix incorrect initial locale negotiation.

Change-Id: Iee15eba4a0c6bc95e804857c465f83a01f48a5e8
 2016-03-30 19:58:32 +00:00
Seigo Nonaka
0ab71b606d Merge "Fix incorrect initial locale negotiation." into nyc-dev 
am: 48d8a39

* commit '48d8a39b7114565838f0db7c7b5ef4bea0819cae':
  Fix incorrect initial locale negotiation.

Change-Id: I8363dbd7df5e79c09a3f0bc0bb3ad00165e302b6
 2016-03-30 19:54:21 +00:00
Roozbeh Pournader
48d8a39b71 Merge "Fix incorrect initial locale negotiation." into nyc-dev 2016-03-30 19:44:25 +00:00
Rubin Xu
29f23aaf2e Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev am: 5b7ca24 
am: 4b86800

* commit '4b8680005545101443e1fbbd3fc5d8a630ce6ae5':
  Add DevicePolicyManager API to install a client cert chain.

Change-Id: I0ff5173cc61f0c19ef5084c97b8fe34fdf9f78d5
 2016-03-30 18:02:08 +00:00
Rubin Xu
4b86800055 Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev 
am: 5b7ca24

* commit '5b7ca24f14ae4d1189ca7683fdad1ec0e62b88b8':
  Add DevicePolicyManager API to install a client cert chain.

Change-Id: I499344fa3ae5d978bec6a4f8498f1ca037bd4505
 2016-03-30 17:57:50 +00:00
Rubin Xu
5b7ca24f14 Merge "Add DevicePolicyManager API to install a client cert chain." into nyc-dev 2016-03-30 17:46:18 +00:00
Clara Bayarri
cc536fd307 Merge "Change default work challenge background color" into nyc-dev am: 30fb053 
am: 3fcd1e7

* commit '3fcd1e74f45fd6a5a0ba8ee44d1a8b41204bfaa9':
  Change default work challenge background color

Change-Id: Ie7e8dc153d2486c10cefcc004598cbb4009e6a31
 2016-03-30 16:32:13 +00:00
Clara Bayarri
3fcd1e74f4 Merge "Change default work challenge background color" into nyc-dev 
am: 30fb053

* commit '30fb0534492478a3f95f6953b31bbb666ced8fe5':
  Change default work challenge background color

Change-Id: Ib9b90a9d84c0502d37fc5b53ef4c83e830a8a822
 2016-03-30 16:24:03 +00:00
Andrei Stingaceanu
bbb3aee63a Merge "AfW custom lock screen message - API polish" into nyc-dev am: b70ba19 
am: f46e776

* commit 'f46e776b063c66a06aa1ccc263ea3b75da43e874':
  AfW custom lock screen message - API polish

Change-Id: Ic9fa7d92d7460dc710bb06338e629d74d533d184
 2016-03-30 16:15:39 +00:00
Clara Bayarri
30fb053449 Merge "Change default work challenge background color" into nyc-dev 2016-03-30 16:13:00 +00:00
Clara Bayarri
8d0bd7fa63 Change default work challenge background color 
Requested by UX

Bug: 27829562
Change-Id: I815c06784189e68b09e464e936521e82091c93c3
 2016-03-30 17:12:08 +01:00
Seigo Nonaka
c14dd78a2c Fix incorrect initial locale negotiation. 
It turned out that calling ResourceManager.setDefaultLocalesLocked
and ResourcesManager.applyConfigurationToResourcesLocked
can be called before the locale negotiation is ready.

To fix this issue, move ResourcesManager setup flow after creating
application context.

This also introduces RuntimeException for notifying developers the
initialize order.

Bug: 27567902
Change-Id: Iab7ea384b039fb649fb52d06d45b2bfae21f9a8a
 2016-03-31 00:21:35 +09:00
Michal Karpinski
e0e1009820 Adjusting javadocs for process logging 
Informing the pre-reboot logs may be empty and specifying that base APK hash is logged.

Bug: 27896341
Change-Id: I9011f6f6ebd0e20e5a4be86f6c5d33094212cc3d
 2016-03-30 15:02:26 +01:00
Andrei Stingaceanu
f46e776b06 Merge "AfW custom lock screen message - API polish" into nyc-dev 
am: b70ba19

* commit 'b70ba1971c29db87e405434161489e2450309050':
  AfW custom lock screen message - API polish

Change-Id: Id2ce5fced3d6b39ab2948cb6ab7ee5001fa534cf
 2016-03-30 12:35:38 +00:00
Andrei Stingaceanu
b70ba1971c Merge "AfW custom lock screen message - API polish" into nyc-dev 2016-03-30 12:23:56 +00:00