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

8000 Commits

Author SHA1 Message Date
Alan Viverette
5fe5ee2a0d Merge "Clean up Dialog annotations, lint warnings, and declarations" into nyc-dev am: f045808 
am: b02fc79

* commit 'b02fc79930fb6f0e5da66b7b93efad58bb1b43cd':
  Clean up Dialog annotations, lint warnings, and declarations

Change-Id: I2943f62dbe414818b26f2191c54dfabafcd4da44
 2016-04-01 20:31:57 +00:00
Alan Viverette
b02fc79930 Merge "Clean up Dialog annotations, lint warnings, and declarations" into nyc-dev 
am: f045808

* commit 'f04580852d387fae556de0250cb18d32169c2cdb':
  Clean up Dialog annotations, lint warnings, and declarations

Change-Id: Ic6de44b10c04ccd5f94e60c6be47166cf64f317e
 2016-04-01 20:27:19 +00:00
Alan Viverette
f04580852d Merge "Clean up Dialog annotations, lint warnings, and declarations" into nyc-dev 2016-04-01 20:17:16 +00:00
Adam Lesinski
bc3a1d4138 Merge "ResourcesManager: Fix a cache issue" into nyc-dev am: ce2a399 
am: 75babad

* commit '75babad207ca90597be1f6aa1d3df1e82fcc5760':
  ResourcesManager: Fix a cache issue

Change-Id: I98d58cf904359b5323d205b9d96f20addc43e951
 2016-04-01 19:09:12 +00:00
Adam Lesinski
75babad207 Merge "ResourcesManager: Fix a cache issue" into nyc-dev 
am: ce2a399

* commit 'ce2a3990323433a3278100531ef6e9184497d058':
  ResourcesManager: Fix a cache issue

Change-Id: I6ec0fb190687fb7a421445938f71cc20aa0bf9af
 2016-04-01 19:05:10 +00:00
Alan Viverette
48728c2179 Clean up Dialog annotations, lint warnings, and declarations 
No functional changes.

Change-Id: If38c9d829d83e762f8c2d05c2fe060c56804b38f
 2016-04-01 15:00:10 -04:00
Adam Lesinski
ce2a399032 Merge "ResourcesManager: Fix a cache issue" into nyc-dev 2016-04-01 18:53:22 +00:00
Adam Lesinski
0cd9a7ea3b ResourcesManager: Fix a cache issue 
Forgot to cache the creating of ResourcesImpl during an Activity
override config update.

Bug:27644297
Change-Id: I65d9086f6d32f5adc7231aa3a1797d4f00c4b9a9
 2016-04-01 11:48:10 -07:00
Alan Viverette
1acd5fe136 Merge "Refactor DatePickerDialog constructors to avoid early callback" into nyc-dev am: 228137f 
am: 1174768

* commit '1174768d99492c8f90b7762eba49356ea5d7c9f2':
  Refactor DatePickerDialog constructors to avoid early callback

Change-Id: Ia05088a2995b1bd20de5999628968c1b20df04e0
 2016-04-01 18:42:01 +00:00
Alan Viverette
1174768d99 Merge "Refactor DatePickerDialog constructors to avoid early callback" into nyc-dev 
am: 228137f

* commit '228137fa269b7e71205174f9d0d9ce91d9a1abfc':
  Refactor DatePickerDialog constructors to avoid early callback

Change-Id: If31e64a6f0a15d60e99c8b7960f906a153a91106
 2016-04-01 18:34:39 +00:00
Alan Viverette
228137fa26 Merge "Refactor DatePickerDialog constructors to avoid early callback" into nyc-dev 2016-04-01 18:22:20 +00:00
Alan Viverette
a9a75f506e Refactor DatePickerDialog constructors to avoid early callback 
Bug: 27475444
Change-Id: I2536f969ca734f3977163305c1d33ee0e2e222fc
 2016-04-01 13:22:10 -04:00
Clara Bayarri
1e9681c51b Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev am: 032a76f 
am: ceeab49

* commit 'ceeab499ac86c16b2b8b53adc713b9796b79961c':
  Remove unused import for KeyboardShortcutGroup

Change-Id: I4119335e332e8c702878a2c734a2d73a9bb19645
 2016-04-01 16:31:21 +00:00
Clara Bayarri
ceeab499ac Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev 
am: 032a76f

* commit '032a76f94b457d255ebc0895bc1d8f3c0b6d8e31':
  Remove unused import for KeyboardShortcutGroup

Change-Id: Id69c4c923a3456857d73a2c21a27be962378bd12
 2016-04-01 16:27:01 +00:00
Clara Bayarri
032a76f94b Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev 2016-04-01 16:18:28 +00:00
Kenny Guy
8bd03c9509 Merge "Allow PO to check if it is in a managed profile." into nyc-dev am: fa7b672 
am: 5ad78db

* commit '5ad78dbd4c4722ab1e1836183bec08f4f85c2b29':
  Allow PO to check if it is in a managed profile.

Change-Id: I8c198bf17c484fee5407341181a4750f8a17fde9
 2016-04-01 14:33:20 +00:00
Kenny Guy
5ad78dbd4c Merge "Allow PO to check if it is in a managed profile." into nyc-dev 
am: fa7b672

* commit 'fa7b6723e6fae582bc4948394b06c0f88dc1baa3':
  Allow PO to check if it is in a managed profile.

Change-Id: I3ae227f65db8deb6a2dc622f91807538aa164c4c
 2016-04-01 14:29:00 +00:00
Kenny Guy
fa7b6723e6 Merge "Allow PO to check if it is in a managed profile." into nyc-dev 2016-04-01 14:23:51 +00:00
Clara Bayarri
89203de878 Remove unused import for KeyboardShortcutGroup 
Left it in accidentally when removing default method.

Change-Id: I6af0712624ffaefff4cb4ad2a9e5a86d7104d2e7
 2016-04-01 14:40:34 +01:00
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
Kenny Guy
ffa3840cf3 Allow PO to check if it is in a managed profile. 
Method was @hide because we only intended to add
managed users in a later release, however we added
createAndManageUser which allows it.

Bug: 27261765
Change-Id: I029f8ef35a3065f7fc598b5f854c8d8cdc9c555d
 2016-03-31 16:40:57 +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