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

268807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
fc0aed25b0 Merge \\"Add API 24 to reference selector.\\" into nyc-dev am: 398d088871 
am: 8d129efa23

Change-Id: If1d947f8bebf5ddf5f65d518d2db34c1549656a9
 2016-06-15 00:44:09 +00:00
Dirk Dougherty
f992a2af12 Merge \\"Add API 24 to reference selector.\\" into nyc-dev am: 398d088871 
am: f44feb36b0

Change-Id: Iff60df549779cd1155a7bfeeb74aca5e546a31ad
 2016-06-15 00:34:01 +00:00
Dirk Dougherty
f44feb36b0 Merge \"Add API 24 to reference selector.\" into nyc-dev 
am: 398d088871

Change-Id: I922cb82b69a13913d83280d1003e292528bdfd88
 2016-06-15 00:28:07 +00:00
Dirk Dougherty
8d129efa23 Merge \"Add API 24 to reference selector.\" into nyc-dev 
am: 398d088871

Change-Id: I51a61188186026eac5c12f3b0d0ec52eebf60f38
 2016-06-15 00:28:03 +00:00
Dirk Dougherty
398d088871 Merge "Add API 24 to reference selector." into nyc-dev 2016-06-15 00:20:27 +00:00
Todd Kennedy
20c0209e2f Merge \\"New API w/ multiple prefixes\\" into nyc-mr1-dev am: d07b87cb1c 
am: 162b74a6fd

Change-Id: I81d79930c6d3d42be61a9ab1cdb5f29d677cd3de
 2016-06-15 00:07:56 +00:00
Todd Kennedy
162b74a6fd Merge \"New API w/ multiple prefixes\" into nyc-mr1-dev 
am: d07b87cb1c

Change-Id: I3296ac4343cfedb5b88470963cb4671e9e3427f6
 2016-06-15 00:03:12 +00:00
Dirk Dougherty
27c820cc4e Merge \\\"Doc change: add diffs for 23->24.\\\" into nyc-dev am: 70e358b017 am: c3c0e94e59 
am: cdf8b9ed94

Change-Id: I5bdc5f2446ab948c23f50498e1ab9c789c8e15ab
 2016-06-15 00:02:18 +00:00
Dirk Dougherty
f615876e9e Merge \\\"Doc change: add diffs for 23->24.\\\" into nyc-dev am: 70e358b017 am: a581e78678 
am: 7b368864f6

Change-Id: Iee6e1af104758f6ebd0a734dfa06cd9aa342cb7b
 2016-06-15 00:02:15 +00:00
Dirk Dougherty
cdf8b9ed94 Merge \\"Doc change: add diffs for 23->24.\\" into nyc-dev am: 70e358b017 
am: c3c0e94e59

Change-Id: I775a41ef489097ec836f8dcbcf7b51bd6224da81
 2016-06-14 23:57:49 +00:00
Todd Kennedy
d07b87cb1c Merge "New API w/ multiple prefixes" into nyc-mr1-dev 2016-06-14 23:57:20 +00:00
Dirk Dougherty
7b368864f6 Merge \\"Doc change: add diffs for 23->24.\\" into nyc-dev am: 70e358b017 
am: a581e78678

Change-Id: I9abf820074d7a1a1abb04351ebfb25a74a9fc50f
 2016-06-14 23:55:13 +00:00
Dirk Dougherty
c3c0e94e59 Merge \"Doc change: add diffs for 23->24.\" into nyc-dev 
am: 70e358b017

Change-Id: I54efbc44f2cea31f575c89a3543f571540653a15
 2016-06-14 23:52:03 +00:00
Dirk Dougherty
a581e78678 Merge \"Doc change: add diffs for 23->24.\" into nyc-dev 
am: 70e358b017

Change-Id: I51b151fce31f891d6ab61f48d094ea56fa0da817
 2016-06-14 23:51:55 +00:00
Aurimas Liutikas
c59422a2c6 Clarify Fragment construtor javadoc. 
Bug:
https://code.google.com/p/android/issues/detail?id=170497
https://code.google.com/p/android/issues/detail?id=55991

Change-Id: If2309f441bb947f32da60ba7926cc6796e472fdf
 2016-06-14 16:50:07 -07:00
TreeHugger Robot
064aa25de3 Merge "Remove TransitionListener after transition completes." 2016-06-14 23:45:47 +00:00
Dirk Dougherty
70e358b017 Merge "Doc change: add diffs for 23->24." into nyc-dev 2016-06-14 23:44:26 +00:00
Winson
e5266730eb Only skip trimming task if the stacks are not null. 
Bug: 29121819, 29359871
Change-Id: I8f8602796e316ed5b36a033e4eaa020650064f74
 2016-06-14 23:35:02 +00:00
Winson Chung
434523b9c4 Merge changes If61a2c1f,I06679897 
* changes:
  Fixing header bar icons.
  Show the correct pointer when dragging task in Recents.
 2016-06-14 23:30:10 +00:00
Shawn Willden
26e8d553e5 Update semantics of on-body Keystore API. 
Architectural changes from the Wear team have required changes to the
semantics of the Keystore on-body feature. Although no devices will
actually implement this feature until the release of new Wear devices
with the necessary sensors, we need to get the API documentation right
now.

Bug: 29369151
Change-Id: I857e00928f994a1337313123eae7e00534c53c3c
 2016-06-14 17:29:54 -06:00
Dirk Dougherty
5f60f7cde6 Add API 24 to reference selector. 
Change-Id: I153245ef814e27bf50f9d972ad1aa34fd92e6b8a
 2016-06-14 16:27:32 -07:00
Wale Ogunwale
3eaf6c9294 Merge \"Merge \\\"Make sure task exists in WM before trying to set the resizing state\\\" into nyc-dev am: 39647560d1 am: a75c0709db\" into nyc-mr1-dev-plus-aosp 
am: e194a1ebd1

Change-Id: Ieb003987ac14bf1cee5bb791ce024d450aa2f74d
 2016-06-14 23:24:48 +00:00
Selim Cinek
cf7735501e Merge \"Merge \\\"Fixed another case where the systemUI could crashloop\\\" into nyc-dev am: 02ab2f52bf am: 24edc3934d\" into nyc-mr1-dev-plus-aosp 
am: fbdcf855b8

Change-Id: I646731c2f91f4640e4cab4566e8c469ef6d4eb4f
 2016-06-14 23:24:45 +00:00
Wale Ogunwale
1ba1d6f3f3 Merge \\\"Make sure task exists in WM before trying to set the resizing state\\\" into nyc-dev am: 39647560d1 am: d0e51b0e89 
am: 82d0424841

Change-Id: I2ca6829b9a65597ffee0e33a27056c0a5f99e898
 2016-06-14 23:24:42 +00:00
Selim Cinek
a592bdf4ed Merge \\\"Fixed another case where the systemUI could crashloop\\\" into nyc-dev am: 02ab2f52bf am: 91965ce2e9 
am: b3e68016e1

Change-Id: Ic05eb942d46db0b66939203ae605f2ea4212b9b2
 2016-06-14 23:24:39 +00:00
Sudheer Shanka
accaa08c98 Allow apps with CREATE_USERS permission to call UM.getUserInfo. 
Bug: 29355382
Change-Id: Iaf73c453156e3a989660d05124b0c0938619abd7
 2016-06-14 16:22:57 -07:00
Android Build Merger (Role)
e194a1ebd1 Merge "Merge \\"Make sure task exists in WM before trying to set the resizing state\\" into nyc-dev am: 39647560d1 am: a75c0709db" into nyc-mr1-dev-plus-aosp 2016-06-14 23:22:15 +00:00
Android Build Merger (Role)
fbdcf855b8 Merge "Merge \\"Fixed another case where the systemUI could crashloop\\" into nyc-dev am: 02ab2f52bf am: 24edc3934d" into nyc-mr1-dev-plus-aosp 2016-06-14 23:22:02 +00:00
Wale Ogunwale
82d0424841 Merge \\"Make sure task exists in WM before trying to set the resizing state\\" into nyc-dev am: 39647560d1 
am: d0e51b0e89

Change-Id: Ib24af6b71579b0ffb0db275dda7598233b6ede1e
 2016-06-14 23:19:53 +00:00
Selim Cinek
b3e68016e1 Merge \\"Fixed another case where the systemUI could crashloop\\" into nyc-dev am: 02ab2f52bf 
am: 91965ce2e9

Change-Id: Ia6dfb5ba27696eb4938f528a57374ae8ef0be16c
 2016-06-14 23:19:50 +00:00
Wale Ogunwale
9a35f2a51f Merge \\"Make sure task exists in WM before trying to set the resizing state\\" into nyc-dev am: 39647560d1 
am: a75c0709db

Change-Id: Ibc7f9407773ba2a7f3995028561e58fc5b5bb52b
 2016-06-14 23:16:55 +00:00
Selim Cinek
d8863daa4f Merge \\"Fixed another case where the systemUI could crashloop\\" into nyc-dev am: 02ab2f52bf 
am: 24edc3934d

Change-Id: I4e1acdf080622aeb71f3401e34b64fa5ea192722
 2016-06-14 23:16:53 +00:00
Andrew Solovay
16075e160b Merge \"Merge \\\"docs: Noted \\\"Crypto\\\" removal\\\" into nyc-dev am: 8d7b4a4945 am: f0dcd27ca6\" into nyc-mr1-dev-plus-aosp 
am: 9802d38583

Change-Id: Idc241e28be92baae161ca051aa0d206a0de1795d
 2016-06-14 23:15:22 +00:00
Andrew Solovay
e543145085 Merge \\\"docs: Noted \\\"Crypto\\\" removal\\\" into nyc-dev am: 8d7b4a4945 am: 8c59ca6902 
am: f23d335ef5

Change-Id: I6be38b0e763929467101d1f8c2e4a28ed499a212
 2016-06-14 23:15:20 +00:00
Wale Ogunwale
d0e51b0e89 Merge \"Make sure task exists in WM before trying to set the resizing state\" into nyc-dev 
am: 39647560d1

Change-Id: Id9f331026d9bc76a0764685c03b0366e821cebc5
 2016-06-14 23:12:14 +00:00
Selim Cinek
91965ce2e9 Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev 
am: 02ab2f52bf

Change-Id: I3ca5e31a3571398d1eb00cf0c7f40d1bb007055f
 2016-06-14 23:12:12 +00:00
Android Build Merger (Role)
9802d38583 Merge "Merge \\"docs: Noted \\"Crypto\\" removal\\" into nyc-dev am: 8d7b4a4945 am: f0dcd27ca6" into nyc-mr1-dev-plus-aosp 2016-06-14 23:11:47 +00:00
Wale Ogunwale
a75c0709db Merge \"Make sure task exists in WM before trying to set the resizing state\" into nyc-dev 
am: 39647560d1

Change-Id: I077e2d9432cdcb4f4e796df158c9fdb701e2a5f6
 2016-06-14 23:11:29 +00:00
Selim Cinek
24edc3934d Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev 
am: 02ab2f52bf

Change-Id: If26ae07e20433213334233bea1231440fae817e1
 2016-06-14 23:11:25 +00:00
Andrew Solovay
077b010e17 Merge \\"docs: Noted \\"Crypto\\" removal\\" into nyc-dev am: 8d7b4a4945 
am: f0dcd27ca6

Change-Id: I5bac345ad36f06b033d26f7911d73e3f80ef1d6e
 2016-06-14 23:11:21 +00:00
Andrew Solovay
f23d335ef5 Merge \\"docs: Noted \\"Crypto\\" removal\\" into nyc-dev am: 8d7b4a4945 
am: 8c59ca6902

Change-Id: Ief92ee6d42efaed06c0d74b234d96bfa6adf44a1
 2016-06-14 23:10:49 +00:00
Yohei Yukawa
ab4e2f055a Merge \\\"Quick workaround for a performance regression in IME APIs.\\\" into nyc-dev am: 6fe4865e85 am: cb2c497230 
am: f3ab69c34c

Change-Id: Ib41bd5974041965e8f99ededd5753ef87a9322af
 2016-06-14 23:10:02 +00:00
Yohei Yukawa
acf01a9f12 Merge \\\"Quick workaround for a performance regression in IME APIs.\\\" into nyc-dev am: 6fe4865e85 am: bb587122c6 
am: da7846ae8b

Change-Id: If0edca2cc2a512d6c0d2dc4d6206068f411edb14
 2016-06-14 23:09:55 +00:00
TreeHugger Robot
39647560d1 Merge "Make sure task exists in WM before trying to set the resizing state" into nyc-dev 2016-06-14 23:05:50 +00:00
Selim Cinek
02ab2f52bf Merge "Fixed another case where the systemUI could crashloop" into nyc-dev 2016-06-14 23:04:31 +00:00
Andrew Solovay
f0dcd27ca6 Merge \"docs: Noted \"Crypto\" removal\" into nyc-dev 
am: 8d7b4a4945

Change-Id: I52083f2f0e7ebf90fe01b25f5f081e5477f1da91
 2016-06-14 23:02:30 +00:00
Andrew Solovay
8c59ca6902 Merge \"docs: Noted \"Crypto\" removal\" into nyc-dev 
am: 8d7b4a4945

Change-Id: I9bc56a5c233f7c6ab02f65098ad7c9a40729cb72
 2016-06-14 23:01:33 +00:00
Todd Kennedy
a97045b245 New API w/ multiple prefixes 
Use the new API that contains multiple hash prefixes and a mask. Also
do some small refactoring necessary to handle multiple prefixes and
use a common implementation of the hash generation

Change-Id: Ib52f767ea6aadc30c67c5bdee949e9f9c5f04e44
 2016-06-14 16:01:05 -07:00
Shawn Willden
5e018c04a6 Unbreak Javadoc on getAttestationChallenge() 
Bug: 28844154
Change-Id: I8402a39f366291cd2b5d646536cd2c2bab8556d2
 2016-06-14 17:00:25 -06:00
Doris Ling
8cdceba0dc Merge \\"Added config system navigation keys.\\" into nyc-mr1-dev am: 32300db186 
am: 4be6c44ee2

Change-Id: I45ff845e5cf67d738c1f25b26bcd7acfe50ea9eb
 2016-06-14 22:57:23 +00:00