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

270693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
9900055575 Merge "Merge \"Merge \\\"Fix adb backup/restore\\\" into nyc-dev am: 45c79447ad am: c5202cac7f\" into nyc-mr1-dev-plus-aosp am: ac8a04c06f" 2016-06-22 23:17:10 +00:00
Android Build Merger (Role)
327187369c Merge "Merge \\\"Fix adb backup/restore\\\" into nyc-dev am: 45c79447ad am: 77d15483ad am: c0f59ce9e8" 2016-06-22 23:17:01 +00:00
Christopher Tate
a2b191e09e Merge \"Merge \\\"Fix adb backup/restore\\\" into nyc-dev am: 45c79447ad am: c5202cac7f\" into nyc-mr1-dev-plus-aosp 
am: ac8a04c06f

Change-Id: I0c0b43d2b223c363abaa57819789dd35940d0ab7
 2016-06-22 23:16:36 +00:00
Christopher Tate
c903e014db Merge \\\"Fix adb backup/restore\\\" into nyc-dev am: 45c79447ad am: 77d15483ad 
am: c0f59ce9e8

Change-Id: I834fb11b8bfe94118f444b080ccc30da3ab70cd3
 2016-06-22 23:16:34 +00:00
Etan Cohen
9a41afcce4 WakeupMessage: add mechanism to specify the object member of Message. 
am: 5b63e6c05a  -s ours

Change-Id: I10e7ed6db8ba570ece21bc31709ed3a853502c70
 2016-06-22 23:16:14 +00:00
Android Build Merger (Role)
ac8a04c06f Merge "Merge \\"Fix adb backup/restore\\" into nyc-dev am: 45c79447ad am: c5202cac7f" into nyc-mr1-dev-plus-aosp 2016-06-22 23:10:07 +00:00
John Reck
f23a1b8e4c Change approach for windowPositionLostRT 
Bug: 29547000

Instead of shifting the window off screen fall
back to the UI-thread calculated values. This fixes
a race issue around tear-down where we stop
drawing long before our window is actually no longer
visible, as well as fixes a funky issue with
PRESERVE_GEOMETRY during first draw.

Change-Id: I792d1966f5aaee1e703295ae79166c723b97a1dc
 2016-06-22 16:10:07 -07:00
Christopher Tate
fc405ceda6 Merge \\"Fix adb backup/restore\\" into nyc-dev am: 45c79447ad 
am: c5202cac7f

Change-Id: I910b4740a535536f53b7d7971f497967089872a1
 2016-06-22 23:09:42 +00:00
Phil Weaver
9fa427403c Merge \"Merge \\\"Report all content changes to a11y services.\\\" into nyc-dev am: 8ac5bcbab2 am: 2abe1c44e0\" into nyc-mr1-dev-plus-aosp 
am: 01c28c0097

Change-Id: If80004e8977f4cbb328c9469d239379b8b7efcd4
 2016-06-22 23:09:33 +00:00
Phil Weaver
787ac57a16 Merge \\\"Report all content changes to a11y services.\\\" into nyc-dev am: 8ac5bcbab2 am: 403ee9c3e0 
am: 4db107306b

Change-Id: I09ff2970856768fbb717490c2c5ee16d42562a29
 2016-06-22 23:09:30 +00:00
Christopher Tate
c0f59ce9e8 Merge \\"Fix adb backup/restore\\" into nyc-dev am: 45c79447ad 
am: 77d15483ad

Change-Id: Ica4b633fd67d3d2bd8b939138c61a64b2022503f
 2016-06-22 23:09:11 +00:00
Christopher Tate
77d15483ad Merge \"Fix adb backup/restore\" into nyc-dev 
am: 45c79447ad

Change-Id: Ieab601b2676f18f068280a9f5dfd8501fd5978f0
 2016-06-22 23:05:05 +00:00
Christopher Tate
c5202cac7f Merge \"Fix adb backup/restore\" into nyc-dev 
am: 45c79447ad

Change-Id: Ie3bce4a97ec1ecb4ba742ef65555b7db510f10d0
 2016-06-22 23:04:44 +00:00
Android Build Merger (Role)
01c28c0097 Merge "Merge \\"Report all content changes to a11y services.\\" into nyc-dev am: 8ac5bcbab2 am: 2abe1c44e0" into nyc-mr1-dev-plus-aosp 2016-06-22 23:01:33 +00:00
Fyodor Kupolov
39297ff2a4 Merge \\\"Use granted userId to look up provider info\\\" into nyc-dev am: f9f2c7ceef am: eb3f3aa46d 
am: fa2b51cd4b

Change-Id: I7cd7e125eb472dcbbc60099647d2d86597a0a834
 2016-06-22 23:01:00 +00:00
Adam Lesinski
1afeff7ac6 Merge \\\"Fix build due to missing abstract method impl\\\" into nyc-dev am: aeef7c4748 am: a34b917ce0 
am: 0f6beb1977

Change-Id: I5998ec0477bd06fbe1c378a09173a91e6108d101
 2016-06-22 23:00:53 +00:00
Phil Weaver
011df38253 Merge \\"Report all content changes to a11y services.\\" into nyc-dev am: 8ac5bcbab2 
am: 2abe1c44e0

Change-Id: Ic761e3a1a23a6e6842881bc43a123bcb03189d36
 2016-06-22 23:00:51 +00:00
Phil Weaver
4db107306b Merge \\"Report all content changes to a11y services.\\" into nyc-dev am: 8ac5bcbab2 
am: 403ee9c3e0

Change-Id: I57789628dea63b871a378121dbe67f0bc3af9fb9
 2016-06-22 23:00:48 +00:00
TreeHugger Robot
45c79447ad Merge "Fix adb backup/restore" into nyc-dev 2016-06-22 22:56:37 +00:00
Fyodor Kupolov
e4c1812750 Merge \\\"Use granted userId to look up provider info\\\" into nyc-dev am: f9f2c7ceef am: 7bc1db96ed 
am: d50b61ff36

Change-Id: Iceec1009f0ac020d402b980e6952a0de7d0a671c
 2016-06-22 22:54:09 +00:00
Phil Weaver
2abe1c44e0 Merge \"Report all content changes to a11y services.\" into nyc-dev 
am: 8ac5bcbab2

Change-Id: I45c63d9887eee21f571984c2e7b2aa31bd80c790
 2016-06-22 22:54:08 +00:00
Adam Lesinski
d06b1695e0 Merge \\\"Fix build due to missing abstract method impl\\\" into nyc-dev am: aeef7c4748 am: e0dc709ac8 
am: c8aa7f98c1

Change-Id: Id3b9a1e0797f26d34415938dee0a032541be2a6c
 2016-06-22 22:54:06 +00:00
Phil Weaver
403ee9c3e0 Merge \"Report all content changes to a11y services.\" into nyc-dev 
am: 8ac5bcbab2

Change-Id: I9338fd3ef749f80c4b0252c7c749fe6e395b3c0a
 2016-06-22 22:53:17 +00:00
Fyodor Kupolov
fa2b51cd4b Merge \\"Use granted userId to look up provider info\\" into nyc-dev am: f9f2c7ceef 
am: eb3f3aa46d

Change-Id: I4a58dc629d8562f33dcc0f43ef2b9aace8e91fa5
 2016-06-22 22:51:28 +00:00
Adam Lesinski
0f6beb1977 Merge \\"Fix build due to missing abstract method impl\\" into nyc-dev am: aeef7c4748 
am: a34b917ce0

Change-Id: I53fe91a7fcb745accf0e660b675b53f76aa55734
 2016-06-22 22:51:22 +00:00
Phil Weaver
8ac5bcbab2 Merge "Report all content changes to a11y services." into nyc-dev 2016-06-22 22:48:50 +00:00
Fyodor Kupolov
d50b61ff36 Merge \\"Use granted userId to look up provider info\\" into nyc-dev am: f9f2c7ceef 
am: 7bc1db96ed

Change-Id: I914c389f3b326eefdada42e2d55c116d308521c4
 2016-06-22 22:47:46 +00:00
Adam Lesinski
c8aa7f98c1 Merge \\"Fix build due to missing abstract method impl\\" into nyc-dev am: aeef7c4748 
am: e0dc709ac8

Change-Id: I2360c6d049352c4e32f33096d3f659d636941417
 2016-06-22 22:47:39 +00:00
Fyodor Kupolov
eb3f3aa46d Merge \"Use granted userId to look up provider info\" into nyc-dev 
am: f9f2c7ceef

Change-Id: I7af8b1867bb4a1784658f445c91158c0e4c43667
 2016-06-22 22:41:57 +00:00
Adam Lesinski
a34b917ce0 Merge \"Fix build due to missing abstract method impl\" into nyc-dev 
am: aeef7c4748

Change-Id: I9d12601b4db0108f313c1a69ada67c92929f548b
 2016-06-22 22:41:52 +00:00
Fyodor Kupolov
7bc1db96ed Merge \"Use granted userId to look up provider info\" into nyc-dev 
am: f9f2c7ceef

Change-Id: Ifb6876fbb424632d3b47ec68686c01b56720b0a4
 2016-06-22 22:41:42 +00:00
Adam Lesinski
e0dc709ac8 Merge \"Fix build due to missing abstract method impl\" into nyc-dev 
am: aeef7c4748

Change-Id: I38fc7c88e9c4ea5abf50a0bec5f2302c4622605f
 2016-06-22 22:41:38 +00:00
Fyodor Kupolov
f9f2c7ceef Merge "Use granted userId to look up provider info" into nyc-dev 2016-06-22 22:28:38 +00:00
Adam Lesinski
aeef7c4748 Merge "Fix build due to missing abstract method impl" into nyc-dev 2016-06-22 22:20:56 +00:00
Jim Miller
07e0384a4e Enable fingerprint sensor navigation to invoke QuickSettings 
- rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"

Fixes bug 28869612

Change-Id: I321240ee54506633d63a29e987b8d8638c652391
 2016-06-22 15:18:13 -07:00
Andrii Kulian
f42cbe8338 Show unsopported display size dialog on relaunch 
If the display density change made app restart when it was focused
or we navigate back to it after density change and it makes it
restart - we didn't display unsupported display size dialog.

Bug: 29574686
Change-Id: Ic8fdc8a54df160f947e2d340ab2cb2931bac195d
 2016-06-22 14:49:58 -07:00
Roozbeh Pournader
f69d5146bd Merge \\"Don\\'t match locales with different scripts in ResourceFilter\\" into nyc-mr1-dev am: 9d2a3188fa 
am: 8a24cfb055

Change-Id: I0c3e03c508680edd7db133b5cc93dbab1383b960
 2016-06-22 21:36:56 +00:00
Robert Greenwalt
ba83347bc6 Merge \\"Add a Carrier-config specific ratcheter of RATs.\\" into nyc-mr1-dev am: 23cac795b0 
am: eafd6a2c2d

Change-Id: I4adc4c549ce01d233ab1c47da4f5b6bd3ccf1e6e
 2016-06-22 21:36:49 +00:00
Felipe Leme
7a04690fbe Merge \"Merge \\\"Fixed whitelistManager assignment.\\\" into nyc-dev am: dea7aa0da1 am: 1f358b11ae\" into nyc-mr1-dev-plus-aosp 
am: 96ead0023e

Change-Id: I1fd9109d53b04b96846f28b63f5aa790a1ba9d71
 2016-06-22 21:36:44 +00:00
Felipe Leme
bc62493ea9 Merge \\\"Fixed whitelistManager assignment.\\\" into nyc-dev am: dea7aa0da1 am: 3aa1952e5c 
am: df404d3780

Change-Id: I4ced4f9d02e406ae9f2d7b69b7f9ecb986d77680
 2016-06-22 21:36:41 +00:00
Roozbeh Pournader
8a24cfb055 Merge \"Don\'t match locales with different scripts in ResourceFilter\" into nyc-mr1-dev 
am: 9d2a3188fa

Change-Id: I9874c4a5d880407ed7b38e63f2c551defedbf8e5
 2016-06-22 21:26:29 +00:00
Jeff Sharkey
b155ef7b09 Merge \"Merge \\\"Avoid runtime restart when storage is missing.\\\" into nyc-dev am: 18553f5f73 am: 5d1d637086\" into nyc-mr1-dev-plus-aosp 
am: 729f34c560

Change-Id: I54b3cff57627e59ab3061459ab8801ad747df2d0
 2016-06-22 21:24:00 +00:00
Jeff Sharkey
677756f17f Merge \\\"Avoid runtime restart when storage is missing.\\\" into nyc-dev am: 18553f5f73 am: c14abae170 
am: 5bea25e4f0

Change-Id: Icf7a47091dd071d445840c9c626bfa0d116b3788
 2016-06-22 21:23:57 +00:00
Lifu Tang
e43d102530 Merge \\\"Added more logs to track WakeLock usages\\\" into nyc-dev am: 335387a1df am: a956144f0d 
am: 96b83c6b90

Change-Id: I4a143269cb94e9f110be3412170504c37661d165
 2016-06-22 21:23:54 +00:00
Lifu Tang
89021f9c5b Merge \\\"Added more logs to track WakeLock usages\\\" into nyc-dev am: 335387a1df am: f6bfce5202 
am: da8f2515af

Change-Id: I620d32059af0531c04f1e2555426852b735cb960
 2016-06-22 21:23:51 +00:00
Adam Lesinski
f4dc0c9f73 Merge \"Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into nyc-dev am: 0bf31c3fa6 am: e894efa9b6\" into nyc-mr1-dev-plus-aosp 
am: f64d010e56

Change-Id: I615fb4a37374493b26efdbe7d8a5cb22dab84855
 2016-06-22 21:23:37 +00:00
Adam Lesinski
b5c8a98b76 Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into nyc-dev am: 0bf31c3fa6 am: a72a6aae37 
am: ce71c120df

Change-Id: I93c1714ded50dc0233185f68b08b7b7803cfc264
 2016-06-22 21:22:15 +00:00
smain@google.com
d30b30763a Merge \\\\\"Move conceptual test info into \\\\\"Getting Started with Testing\\\\\" and move the procedural information into the corresponding guides for creating unit tests.\\\\\" into mnc-io-docs am: 8af7a89820 am: 359b8cd443 am: 9802883bb3 am: a1489339c7 
am: 7dcad6e188

Change-Id: I0e01df8325e66b8132afd9e4b7063d5521cd81ab
 2016-06-22 21:22:13 +00:00
smain@google.com
019bac2ff2 Merge \\\\\"Move conceptual test info into \\\\\"Getting Started with Testing\\\\\" and move the procedural information into the corresponding guides for creating unit tests.\\\\\" into mnc-io-docs am: 8af7a89820 am: 359b8cd443 am: 9802883bb3 am: c5dc951937 
am: ea29b66d65

Change-Id: I29e9fe7581127a1bc5eff85e9be15c3375cd2ef5
 2016-06-22 21:22:10 +00:00
Jeff Sharkey
f9070c1040 Merge \\\"Start primary storage move outside lock.\\\" into nyc-dev am: a3290363e1 am: b688e58c4a 
am: 2d823538fe

Change-Id: I4ce0310830da6adaeaf2b467b4c16805463d5943
 2016-06-22 21:22:08 +00:00