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

13391 Commits

Author SHA1 Message Date
Przemyslaw Szczepaniak
9ede567f7c Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968 
Version with test-current.txt

Bug: 28666126
Change-Id: I385e3ce957d966bc27531ed915fe8cc8aeb577ab
 2016-07-05 08:59:10 +00:00
Przemyslaw Szczepaniak
ce482360b9 Merge \"Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968\" 
am: 326e55a3e2

Change-Id: I404c9665d23664f137462c246ebc724128035555
 2016-07-05 08:54:24 +00:00
Przemyslaw Szczepaniak
326e55a3e2 Merge "Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968" 2016-07-05 08:42:05 +00:00
Przemyslaw Szczepaniak
bab82f1df8 Track libcore change 4eed609c71648c069d8e83ec7001da29044d416b 
Bug: 27464570
Change-Id: I761cab7198f2608b8e76e9a5c775e3bcec44d781
 2016-07-04 16:35:28 +01:00
Przemyslaw Szczepaniak
f0db6e8d94 Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968 
Bug: 28666126
Change-Id: I385e3ce957d966bc27531ed915fe8cc8aeb577ab
 2016-06-29 17:41:01 +01:00
Yi Kong
79f65e5d67 Merge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\" into stage-aosp-master 
am: a725dbd6c7

Change-Id: I06af085c2dad7d63539f66b8049d14a73e49c7cc
 2016-06-24 16:55:38 +00:00
Yi Kong
a725dbd6c7 Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" into stage-aosp-master 2016-06-24 16:47:31 +00:00
Yi Kong
f388075f8f Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" 2016-06-24 16:47:03 +00:00
Przemyslaw Szczepaniak
3606de0fb4 Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a 
am: ab3d167f06

Change-Id: Ie65f8c8d85ea689c210a40b3ee6373c146488cd1
 2016-06-24 11:53:57 +00:00
Przemyslaw Szczepaniak
387191bc64 Merge \\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\" am: 36ce097dbb 
am: 12bb15c1d3

Change-Id: I5a44a8a58c0f90396c95755e919c05fdd500a3cd
 2016-06-24 11:33:42 +00:00
Przemyslaw Szczepaniak
ab3d167f06 Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a 
version with test-current.txt

Bug: 28666126
Change-Id: Ib97b5124e0cf28370b0deee81306e761c9bf9059
 2016-06-24 11:33:27 +00:00
Przemyslaw Szczepaniak
12bb15c1d3 Merge \"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\" 
am: 36ce097dbb

Change-Id: Ida8dcbbd72df17bbcc49bbccc0cec562d4a6a0e7
 2016-06-24 11:23:01 +00:00
Przemyslaw Szczepaniak
18d9fb485c Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a 
This change reverts previous fix for b/27582395 and makes
AbstractStringBuffer an Appendable. 

Bug: 28666126
Bug: 27582395 
Change-Id: I4b1b554fb47f45459eec24801af4ec798fc3039b
 2016-06-24 10:53:06 +00:00
Yi Kong
88b878505e Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259 
Bug: 29067535
Change-Id: Ib0049db9ad5f6dfcdb04598ba288a1d94c32a31c
(cherry picked from commit fdbf33126ee9d4972ccde4e4ac23cf7074b5b3ed)
 2016-06-24 11:15:33 +01:00
Yi Kong
fdbf33126e Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259 
Bug: 29067535
Change-Id: Ib0049db9ad5f6dfcdb04598ba288a1d94c32a31c
 2016-06-22 14:17:55 +01:00
Yorke Lee
072ce0c29c Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev 
am: 22faa5ddb1

Change-Id: Icbe2a2b78d19dbdf067aa69a2e0c539a809893aa
 2016-06-21 21:20:11 +00:00
Yorke Lee
c8ad0cd316 Tweaks to DragAndDropPermissions behavior 
No longer release permissions in finalize(), so that
apps do not have to maintain a reference to the
DragAndDropPermissions object.

Also make it parcelable, so that permission instances can be
retained across activity instances so that they can be
manually released.

Bug: 29162822

Change-Id: Ie604dd3e83ee45a8665d743449b91857dd54e896
 2016-06-21 12:57:52 -07: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 ade5c7c8930969b50b6653ab28d87cccbd566547)

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

Bug: 28666126

(cherry picked from commit aa021e854ef84f7a7aff109b5bec824190f9ebfa)

Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
 2016-06-16 20:51:23 +00:00
Yi Kong
f5bdd8eae6 Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\" 
am: 1850851670

Change-Id: I6997e3b34d87cb091be99318ea1743c972ca1c84
 2016-06-16 17:02:37 +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
ade5c7c893 Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92 
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
(cherry picked from commit af823e0ebf987d5715d6df80b3c9335b4e3a2cdb)
 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 aa021e854ef84f7a7aff109b5bec824190f9ebfa)
 2016-06-16 15:58:27 +00:00
Yi Kong
af823e0ebf Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92 
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
 2016-06-16 14:29:41 +01: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 0652d1c024818901cbbd58000910871b1ab5ebae)
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 7c8e76f87de28acc19935083a0f502df83c4a023.

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