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

13369 Commits

Author SHA1 Message Date
Yi Kong
53cf79e185 Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92" into nyc-dev-plus-aosp 2016-06-16 16:17:49 +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
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
d37e23c50c Merge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\" 
am: 47ef3bf172

Change-Id: I15352fb15ffb6d427ddf92cb084c2cfc4c0f8368
 2016-06-16 12:33:21 +00:00
Przemyslaw Szczepaniak
a82f0622f1 Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c 
Bug: 28666126
Change-Id: I52b859a5504536413f74c1e27d3eb7f1f930dc20
 2016-06-16 13:07:31 +01:00
Fredrik Roubert
0af16f3d36 API updated for ICU4J 57.1 
Bug: 27819846
Change-Id: I891853397ac1f4de58fd0687e7cab27bd270ac64
 2016-06-14 15:03:51 +02:00
Amith Yamasani
c33507d441 Merge \"Add a separate read permission for oem unlock state\" into nyc-dev 
am: 718f321369

Change-Id: I934a06f985319d4520044aff7adf4329f0c27953
 2016-06-08 18:16:40 +00:00
Amith Yamasani
718f321369 Merge "Add a separate read permission for oem unlock state" into nyc-dev 2016-06-08 17:55:41 +00:00
Amith Yamasani
d2b21047c8 Add a separate read permission for oem unlock state 
New privileged permission READ_OEM_UNLOCK_STATE added
for system privileged apps.

Changing the unlock state still requires the old
permission OEM_UNLOCK_STATE, which is signature protected.

Bug: 28953956
Change-Id: Iedd2ad1d2d1dc3ae91122d7c406e3ee623a47d61
 2016-06-03 14:33:26 -07:00
Michael Wright
36481749e6 Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev 
am: 44b24c9b38

* commit '44b24c9b38d87dfd8bee2aca381f18a9106313dc':
  Revert "Revert "Finalize resource IDs for N.""

Change-Id: Ie8327dac7fbecebe98ce9f7cc9c3d29d818b23f6
 2016-06-03 19:27:36 +00:00
Shubham Ajmera
85a5fa0e76 Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5 
Bug: 27331465
(cherry-picked from commit 0652d1c024)
Change-Id: I1a3dd1a550b081535eb8bf79b43edff46da58d6b
 2016-06-02 12:34:04 +00:00
Shubham Ajmera
99296c2100 Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5" am: 4d14e9d461 
am: 4b44cb24b4

* commit '4b44cb24b4d8bb938451321d26216bc2a01d6411':
  Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5

Change-Id: I08c901400757ca6cd3525083bb43840947306039
 2016-06-02 10:55:04 +00:00
Michael Wright
7eb543ef2c Merge "Revert "Finalize resource IDs for N."" into nyc-dev 
am: 82a8c5f246

* commit '82a8c5f24653baf98a77f050f14e7256e864cbf9':
  Revert "Finalize resource IDs for N."

Change-Id: I2b1f1ba907bc2348fc24de63cfc0c195f2d313fd
 2016-05-27 21:45:48 +00:00
Michael Wright
66eeff63b7 Merge "Finalize resource IDs for N." into nyc-dev 
am: 7bbab7e440

* commit '7bbab7e440c4968a5710d31f86168a4c8de66af9':
  Finalize resource IDs for N.

Change-Id: I6eb87bf4e6ee41ea32e497562635a8432b85ba59
 2016-05-26 23:25:11 +00:00
Michael Wright
c38a203376 Revert "Revert "Finalize resource IDs for N."" 
This reverts commit a5c9ca4f07418b80ac99a3d23df012d77faa2bc4.

Bug: 28810934
Change-Id: I31816ab5470b84f85c8416312b5ac39884b8cc9a
 2016-05-26 17:38:11 +01:00
Michael Wright
9ed5eefc28 Revert "Finalize resource IDs for N." 
This reverts commit 7c8e76f87d.

Bug: 28810934
Change-Id: I3a61bb0c2364909480045dd40adba6445d6afabd
 2016-05-26 17:38:06 +01:00
Michael Wright
7c8e76f87d Finalize resource IDs for N. 
Bug: 28810934
Change-Id: If68bfb46cc5fa2d5ea0ee613689198e1ea42dce7
 2016-05-26 17:35:28 +01:00
Jonathan Basseri
531cd8724c Merge "Change how TelephonyManager handles subscriptions." into nyc-dev 
am: 4c04097fdb

* commit '4c04097fdbe0fe414a6fcb2d6174e295986a3f66':
  Change how TelephonyManager handles subscriptions.

Change-Id: I5d63caf41cb55d3077f9a3c00f4f1cce6bbe5ddd
 2016-05-26 16:12:55 +00:00
Ji Yang
e6c6ca417d Merge "Rename carrier messaging API constant." into nyc-dev 
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I476b10118136b13a49b1d55864bbef8e568d6c7e
 2016-05-26 15:54:38 +00:00
Jonathan Basseri
4c04097fdb Merge "Change how TelephonyManager handles subscriptions." into nyc-dev 2016-05-26 15:50:05 +00:00
Ji Yang
f7375b46ff Merge "Rename carrier messaging API constant." into nyc-dev 2016-05-26 15:40:12 +00:00
Michael Wright
4f6ae7bbaa Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 
am: c396f0f70e

* commit 'c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: Iede50a709849ed27cb9723a565b946e00fb23be7
 2016-05-26 14:39:03 +00:00
Michael Wright
c396f0f70e Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 2016-05-26 14:03:47 +00:00
Jonathan Basseri
8a6561d177 Change how TelephonyManager handles subscriptions. 
Addressing API council feedback, remove* all subscription ID arguments
from API calls, and provide a factory method to create a new
TelephonyManager which uses a given subId.

* The subId methods will be @hidden instead of deleted.

Bug: 28845064
Change-Id: I2de8ae9e45bc14962c7c20d7d076ec83bce92cd3
 2016-05-25 18:49:11 -07:00
Adam Powell
0b478d5b05 Merge "N is API 24" into nyc-dev 
am: bc983c4431

* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
  N is API 24

Change-Id: Ib90f6e51c793d1cb61f806196b93736edf2014d8
 2016-05-26 01:22:00 +00:00
TreeHugger Robot
bc983c4431 Merge "N is API 24" into nyc-dev 2016-05-26 01:03:08 +00:00
Stephan Linzner
347d660ce2 Merge "Un-deprecated Android mock testing APIs" into nyc-dev 
am: dac0708ea0

* commit 'dac0708ea0efab696cd772ab346becbcc03232e6':
  Un-deprecated Android mock testing APIs

Change-Id: I21d0f3a65af94074ba477d4acaa20ff9686f9f5c
 2016-05-26 00:33:05 +00:00
TreeHugger Robot
dac0708ea0 Merge "Un-deprecated Android mock testing APIs" into nyc-dev 2016-05-26 00:22:29 +00:00
Derek Tan
869f32d810 Merge "Per API review, revert the API renaming CL." into nyc-dev 
am: 03d3f4a6cb

* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
  Per API review, revert the API renaming CL.

Change-Id: Ic5fb3154e837742622e27fbc2d68eb19930a2faf
 2016-05-25 23:50:45 +00:00
Adam Powell
43ec62af45 N is API 24 
Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08
 2016-05-25 16:42:56 -07:00
Derek Tan
03d3f4a6cb Merge "Per API review, revert the API renaming CL." into nyc-dev 2016-05-25 23:41:21 +00:00
Stephan Linzner
ebdc157bc0 Un-deprecated Android mock testing APIs 
Some mock APIs don't have an ATSL equivalent yet
will be deprecated in O timeframe now.

Change-Id: Ibb7ec32fba3d16f0ea02d100f4e4fc8f011288f0
Bug: 28295815
 2016-05-25 22:54:27 +00:00
Antonio Cansado
c37ba5cbc1 Merge "Cleaning up NetworkStatsManager." into nyc-dev 
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: I236ffb5f753834931511d7df01333670de01604f
 2016-05-25 22:25:27 +00:00
Antonio Cansado
c45f0aea71 Merge "Cleaning up NetworkStatsManager." into nyc-dev 2016-05-25 22:17:21 +00:00
Jeff Sharkey
55a83354bf Merge "API council feedback: hide and document." into nyc-dev 
am: dfe232c763

* commit 'dfe232c7636d16379191442bdb2bac59d7a60f5c':
  API council feedback: hide and document.

Change-Id: I180f504fe21f6f90179d359e8808ffff006e4538
 2016-05-25 20:51:03 +00:00
TreeHugger Robot
dfe232c763 Merge "API council feedback: hide and document." into nyc-dev 2016-05-25 20:43:56 +00:00
Mady Mellor
8bfb5b971d Merge "Changes based on API council feedback for performContextClick" into nyc-dev 
am: 7c17e70f2f

* commit '7c17e70f2f795ca06006ff2560c8b8211ce1dd52':
  Changes based on API council feedback for performContextClick

Change-Id: Ibf53f8081db8b847d18eaa8fee983b677b62f9bc
 2016-05-25 19:08:17 +00:00
Mady Mellor
7c17e70f2f Merge "Changes based on API council feedback for performContextClick" into nyc-dev 2016-05-25 19:00:08 +00:00
Derek Tan
818822ad5d Per API review, revert the API renaming CL. 
Revert "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager."

This reverts commit 3bf26b5605.

Bug: 28295813
Change-Id: I44e7925c86c68a79b8d962670baadea7a7227ca2
 2016-05-25 18:37:05 +00:00
Antonio Cansado
904237f839 Cleaning up NetworkStatsManager. 
- Throwing SecurityExceptionand and IllegalArgumentException instead of null for new APIs
- removing @removed APIs

Bug:27530098,27379882
Change-Id: Ifbe65bfc5051aa33aff2baa22cfa8e67b0f7c358
 2016-05-25 11:07:41 -07:00
Chris Banes
def151052c Merge "Fix text appearances not working in colored button styles" into nyc-dev 
am: 163236156f

* commit '163236156f28449272e16193930692d2cc0011cb':
  Fix text appearances not working in colored button styles

Change-Id: I229589acdd58746f4a230643ae025fa4639a7991
 2016-05-25 18:05:52 +00:00
Chris Banes
163236156f Merge "Fix text appearances not working in colored button styles" into nyc-dev 2016-05-25 17:57:12 +00:00
Julia Reynolds
39c013811e Merge changes from topic \'cps\' into nyc-dev 
am: d3827be162

* commit 'd3827be1620a8cb3bb1dfa42d07334f3be4382ef':
  Api updates.
  Note timezone changes.

Change-Id: I52055d3a5193bed6392327bd5df82dc7880c5ce7
 2016-05-25 17:16:01 +00:00
Julia Reynolds
ad41a6f0de Api updates. 
Change-Id: Ibafef673c54e4ff07bca2bbe70db6cad799b8033
Fixes: 28818092
 2016-05-25 13:02:50 -04:00
Mady Mellor
4f3ab93147 Changes based on API council feedback for performContextClick 
Added an overloaded version with (float x, float y).

Fixes: 28295818
Change-Id: I41c2bf225964436655986b3ad4d0c630c658e38b
 2016-05-25 09:52:51 -07:00
Chris Banes
ec39b57e6f Fix text appearances not working in colored button styles 
Caused by using an explicit textColor in the base
styles, which will always override any textColors in the
text appearance.

BUG: 28933171
Change-Id: I3a9b2884cdd66b329593ae5cea0c314244f4f116
 2016-05-25 16:49:43 +00:00
Jean-Michel Trivi
2c5efb4827 Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev 
am: 3a91a8417a

* commit '3a91a8417a9de03a2f8f276fcd2d67dc43315464':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I1211c2411d052762d95896c0e22661bd718c3039
 2016-05-24 21:24:03 +00:00
Jean-Michel Trivi
3a91a8417a Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev 2016-05-24 21:17:49 +00:00