Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
b5952d22f0 Merge "Enforce background fallback to be non-translucent" into nyc-dev 
am: a35724f666

* commit 'a35724f6667e80abc5e6b45e75d7000d3fb17267':
  Enforce background fallback to be non-translucent

Change-Id: If68ead500309566e66230b079f71667e0d555be0
 2016-05-31 23:02:23 +00:00
Chris Tate
cd0aa9cda8 Merge "Don't bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev 2016-05-31 22:59:26 +00:00
Hall Liu
45784f13ef Add null check in showLockTaskToast 
Bug: 29056498
Change-Id: Ic4333ec4f43e3c2916a4963b5ddf9e6ad10136ed
 2016-05-31 15:50:48 -07:00
Jorim Jaggi
a35724f666 Merge "Enforce background fallback to be non-translucent" into nyc-dev 2016-05-31 22:50:09 +00:00
Steve McKay
dd3622db31 Merge "Merge "Don\'t assert on uris with stack." into nyc-dev am: 760b557158 am: 5371f04cac" into nyc-mr1-dev-plus-aosp 
am: a015abdf32

* commit 'a015abdf32d6bb284254e52a0a6ac2774f21687c':

Change-Id: Ic7f938c5597dc632ed16af447cc659316361fbc2
 2016-05-31 22:30:12 +00:00
Steve McKay
0248f8d886 Merge "Don\'t assert on uris with stack." into nyc-dev am: 760b557158 am: 379b014ab5 
am: 9fa20bf392

* commit '9fa20bf3922e849bc5036f998da9fad34a61571f':
  Don't assert on uris with stack.

Change-Id: I7c536c5ccea0fedfa8e9416d3614f55bc6d2c881
 2016-05-31 22:19:54 +00:00
Christopher Tate
09d7d8f674 Don't bother with WeakHashMap for direct alarm bookkeeping 
Call cancel() explicitly before dropping local references to your
callback objects; they won't just quietly go away.

Bug 28987260

Change-Id: Id9da66ed86a46b4fb38127e2ddd7a7d84fd2313a
 2016-05-31 15:19:47 -07:00
Android Build Merger (Role)
a015abdf32 Merge "Merge "Don\'t assert on uris with stack." into nyc-dev am: 760b557158 am: 5371f04cac" into nyc-mr1-dev-plus-aosp 2016-05-31 22:17:17 +00:00
Steve McKay
004e08c6c9 Merge "Don\'t assert on uris with stack." into nyc-dev am: 760b557158 
am: 5371f04cac

* commit '5371f04cac25f55b2f6d350b260a92661a4df22c':
  Don't assert on uris with stack.

Change-Id: I9d1d502c5316eee096c34d3e33ba108729d8ea70
 2016-05-31 22:16:43 +00:00
Steve McKay
9fa20bf392 Merge "Don\'t assert on uris with stack." into nyc-dev am: 760b557158 
am: 379b014ab5

* commit '379b014ab57178269c770f60ab9c11ce7c7e3b57':
  Don't assert on uris with stack.

Change-Id: I144f60ac2ea900bf65ca90b3613a0ef7c2291dc5
 2016-05-31 22:15:10 +00:00
Steve McKay
5371f04cac Merge "Don\'t assert on uris with stack." into nyc-dev 
am: 760b557158

* commit '760b5571582056e756d9fb1bc366247bc26a8e54':
  Don't assert on uris with stack.

Change-Id: I888984060b578ecff9dfefc70e6adacafe49e14c
 2016-05-31 22:10:08 +00:00
Steve McKay
379b014ab5 Merge "Don\'t assert on uris with stack." into nyc-dev 
am: 760b557158

* commit '760b5571582056e756d9fb1bc366247bc26a8e54':
  Don't assert on uris with stack.

Change-Id: Id18689de7d04ae2627ea64612fe7fd8f2ac5f445
 2016-05-31 22:10:07 +00:00
TreeHugger Robot
760b557158 Merge "Don't assert on uris with stack." into nyc-dev 2016-05-31 22:03:29 +00:00
Joe Onorato
c5b58305c8 Merge "Merge "Turn this wtf into just a log." into nyc-dev am: 1755dd08cb am: 668a60bf8d" into nyc-mr1-dev-plus-aosp 
am: 949a9bdfb8

* commit '949a9bdfb864c6e0eca29da212a9e1ff29fc132a':

Change-Id: I3f8f6bd38b495bbaf711b20809480088cd09f274
 2016-05-31 22:00:30 +00:00
Joe Onorato
8d8408e83b Merge "Turn this wtf into just a log." into nyc-dev am: 1755dd08cb am: 253051c57f 
am: de4dd0bc48

* commit 'de4dd0bc489691da3a1b787915a14a75091fd3cd':
  Turn this wtf into just a log.

Change-Id: I697cef9d4ca26406419af0f9eafd812d95cbf817
 2016-05-31 22:00:26 +00:00
Android Build Merger (Role)
949a9bdfb8 Merge "Merge "Turn this wtf into just a log." into nyc-dev am: 1755dd08cb am: 668a60bf8d" into nyc-mr1-dev-plus-aosp 2016-05-31 21:57:03 +00:00
Joe Onorato
a288950b49 Merge "Turn this wtf into just a log." into nyc-dev am: 1755dd08cb 
am: 668a60bf8d

* commit '668a60bf8d700bfe57079390dfcc37c29402c8ac':
  Turn this wtf into just a log.

Change-Id: I3aa863dd535f58257c553dc3534b9a18845416d1
 2016-05-31 21:56:38 +00:00
Joe Onorato
de4dd0bc48 Merge "Turn this wtf into just a log." into nyc-dev am: 1755dd08cb 
am: 253051c57f

* commit '253051c57f84a0cccdc369db2dcb96a42c8f8c78':
  Turn this wtf into just a log.

Change-Id: I340d7628b855b0978ee7e26d264455e3f3c6947d
 2016-05-31 21:56:00 +00:00
George Mount
b61471a22c Merge "Merge "Better handling of confused finish transition." into nyc-dev am: 2fd9cd7cbb am: eb18c0fa69" into nyc-mr1-dev-plus-aosp 
am: bbd89bc20c

* commit 'bbd89bc20cf58058847ab03731b88dd6f1d0e5d5':

Change-Id: I486b925fed6ea9886d012f9623f44de28729f612
 2016-05-31 21:51:20 +00:00
Joe Onorato
253051c57f Merge "Turn this wtf into just a log." into nyc-dev 
am: 1755dd08cb

* commit '1755dd08cbcdd2ffb14ac2eb84edc663843ced24':
  Turn this wtf into just a log.

Change-Id: I20cfd2c9ec4c6d95d6e638aff7955324d98f1495
 2016-05-31 21:50:21 +00:00
Joe Onorato
668a60bf8d Merge "Turn this wtf into just a log." into nyc-dev 
am: 1755dd08cb

* commit '1755dd08cbcdd2ffb14ac2eb84edc663843ced24':
  Turn this wtf into just a log.

Change-Id: I6e4a129e2ba7ea6d23e5d3a07b120278a373ed10
 2016-05-31 21:50:18 +00:00
George Mount
51e79e4452 Merge "Better handling of confused finish transition." into nyc-dev am: 2fd9cd7cbb am: 27a0e5a632 
am: cf653fa891

* commit 'cf653fa891078fe95af515a0cc8aba4e785919f0':
  Better handling of confused finish transition.

Change-Id: Iec8aa21cd416b69399e60de43e11029dcfb7f272
 2016-05-31 21:46:06 +00:00
Android Build Merger (Role)
bbd89bc20c Merge "Merge "Better handling of confused finish transition." into nyc-dev am: 2fd9cd7cbb am: eb18c0fa69" into nyc-mr1-dev-plus-aosp 2016-05-31 21:43:28 +00:00
George Mount
9c48dc3cce Merge "Better handling of confused finish transition." into nyc-dev am: 2fd9cd7cbb 
am: eb18c0fa69

* commit 'eb18c0fa699bd9fe6981cb9e5f170962aaf72d09':
  Better handling of confused finish transition.

Change-Id: Ia5b9172acfa7405cc7cc179050ee1f489a856e01
 2016-05-31 21:42:56 +00:00
TreeHugger Robot
1755dd08cb Merge "Turn this wtf into just a log." into nyc-dev 2016-05-31 21:42:46 +00:00
George Mount
cf653fa891 Merge "Better handling of confused finish transition." into nyc-dev am: 2fd9cd7cbb 
am: 27a0e5a632

* commit '27a0e5a6323cd8712c34f6da9bacbecd6f6b51f8':
  Better handling of confused finish transition.

Change-Id: I0da6175da030570bd26117f1cd1e33a7ddf2c51d
 2016-05-31 21:42:16 +00:00
George Mount
eb18c0fa69 Merge "Better handling of confused finish transition." into nyc-dev 
am: 2fd9cd7cbb

* commit '2fd9cd7cbb7a792d041d0e0780b11b12b4591a90':
  Better handling of confused finish transition.

Change-Id: I0b43e01df97b98a7b646999999611c7aafbea33a
 2016-05-31 21:38:07 +00:00
George Mount
27a0e5a632 Merge "Better handling of confused finish transition." into nyc-dev 
am: 2fd9cd7cbb

* commit '2fd9cd7cbb7a792d041d0e0780b11b12b4591a90':
  Better handling of confused finish transition.

Change-Id: I27914d6161ab68ce236b9d15e5d07c71889edb4e
 2016-05-31 21:37:51 +00:00
TreeHugger Robot
2fd9cd7cbb Merge "Better handling of confused finish transition." into nyc-dev 2016-05-31 21:31:31 +00:00
Todd Kennedy
d1edab0ebd Merge "Merge "Remove STOPSHIP" into nyc-dev am: 1c39a112b4 am: 4fb6509032" into nyc-mr1-dev-plus-aosp 
am: f864ebdde5

* commit 'f864ebdde5114839c4858a1c0280609583174245':

Change-Id: I76e317302b643ec231d3f289228e768e2378264f
 2016-05-31 21:28:51 +00:00
Todd Kennedy
dc7c683034 Merge "Remove STOPSHIP" into nyc-dev am: 1c39a112b4 am: b86c149e60 
am: b6c9423e40

* commit 'b6c9423e406b0cd3aec2faee1f0133720ee92af4':
  Remove STOPSHIP

Change-Id: Ic5b479bbf748391e4c566e7d3d95a3321a769818
 2016-05-31 21:24:43 +00:00
Android Build Merger (Role)
f864ebdde5 Merge "Merge "Remove STOPSHIP" into nyc-dev am: 1c39a112b4 am: 4fb6509032" into nyc-mr1-dev-plus-aosp 2016-05-31 21:20:59 +00:00
Todd Kennedy
b2056cdaac Merge "Remove STOPSHIP" into nyc-dev am: 1c39a112b4 
am: 4fb6509032

* commit '4fb65090324ff0696e5d38795eaeebf70c72e253':
  Remove STOPSHIP

Change-Id: Ie72a056fea017c09545538a2fe989234574d1315
 2016-05-31 21:20:33 +00:00
Todd Kennedy
b6c9423e40 Merge "Remove STOPSHIP" into nyc-dev am: 1c39a112b4 
am: b86c149e60

* commit 'b86c149e60a03750fd757034161f3fba326446e0':
  Remove STOPSHIP

Change-Id: I63dd333ceb73815329f6ba075c2acc67b48c74b6
 2016-05-31 21:20:01 +00:00
sergeyv
aebbbef565 HWUI: do nothing in case of empty layer 
bug:28862058
Change-Id: I8e09a5c33d0eb00a829be4df706dab49cad48b1e
 2016-05-31 14:18:02 -07:00
Sharvil Nanavati
0e243c0cf3 Merge "Fix crash with intent-less actions" into nyc-dev am: ac2b44f502 am: 7a845c5283 
am: da3950d2a2

* commit 'da3950d2a2413077acbb44b1e887bac11dc6c5f8':
  Clean up Bluetooth test code.

Change-Id: I906af814f219367a09deb269a935a91cccc07d0c
 2016-05-31 21:15:31 +00:00
Todd Kennedy
4fb6509032 Merge "Remove STOPSHIP" into nyc-dev 
am: 1c39a112b4

* commit '1c39a112b43e50da4e801d634e28ae7a130c0dcb':
  Remove STOPSHIP

Change-Id: Icc176dca4735f3b03c8e1b47015792ecc202d398
 2016-05-31 21:14:37 +00:00
Todd Kennedy
b86c149e60 Merge "Remove STOPSHIP" into nyc-dev 
am: 1c39a112b4

* commit '1c39a112b43e50da4e801d634e28ae7a130c0dcb':
  Remove STOPSHIP

Change-Id: I15ad40f01dd8bb86f1f64af67760de2a6e1db535
 2016-05-31 21:14:28 +00:00
Adrian Roos
e813bf4573 Merge "Merge "Fix crash with intent-less actions" into nyc-dev am: ac2b44f502 am: e090dcbc8a" into nyc-mr1-dev-plus-aosp 
am: 755b1e28c0

* commit '755b1e28c026be45862aab325a6ea39cc0ddf5f8':

Change-Id: I33f88b847f42c1c2ee1d3ac4c455bb1977b974bc
 2016-05-31 21:10:55 +00:00
Adrian Roos
c52fa732c1 Merge "Fix crash with intent-less actions" into nyc-dev am: ac2b44f502 am: a8231efd8f 
am: 9af97c2879

* commit '9af97c28797b7d46613c4f569669139511934dcf':
  Fix crash with intent-less actions

Change-Id: I3c4d852918e598fa9a44499ae0b879e967ac04f3
 2016-05-31 21:10:43 +00:00
Philip P. Moltmann
61a530742f Use SkMatrix to compute pdf transformation. 
Bug: 28051413
Change-Id: Id17db12801a33955426d7e01d0af950b1c6468cf
 2016-05-31 14:09:08 -07:00
Adrian Roos
da3950d2a2 Merge "Fix crash with intent-less actions" into nyc-dev am: ac2b44f502 
am: 7a845c5283

* commit '7a845c52834d00035ca92ec46d311aef3cd0835a':
  Clean up Bluetooth test code.

Change-Id: I8ff0ff77cc94caa1645f7d37aa6f5a6f5cf72c54
 2016-05-31 21:08:54 +00:00
Todd Kennedy
1c39a112b4 Merge "Remove STOPSHIP" into nyc-dev 2016-05-31 21:07:34 +00:00
Android Build Merger (Role)
755b1e28c0 Merge "Merge "Fix crash with intent-less actions" into nyc-dev am: ac2b44f502 am: e090dcbc8a" into nyc-mr1-dev-plus-aosp 2016-05-31 21:04:44 +00:00
Adrian Roos
e8987c9e74 Merge "Fix crash with intent-less actions" into nyc-dev am: ac2b44f502 
am: e090dcbc8a

* commit 'e090dcbc8a6f85ebe024230826c43b0111355c18':
  Fix crash with intent-less actions

Change-Id: I495f6765ac067e07e2f5ee24242eb3d6b533d67c
 2016-05-31 21:04:12 +00:00
Adrian Roos
9af97c2879 Merge "Fix crash with intent-less actions" into nyc-dev am: ac2b44f502 
am: a8231efd8f

* commit 'a8231efd8f5c7e01e69edab4a2918fb085e2df50':
  Fix crash with intent-less actions

Change-Id: If1c10516ce5a1fec4d9274e288109a04f01a03af
 2016-05-31 21:04:09 +00:00
Sharvil Nanavati
7a845c5283 Merge "Clean up Bluetooth test code." into nyc-mr1-dev 2016-05-31 21:03:46 +00:00
Adrian Roos
f286ca27f4 AppError: Change "close" to "close app" 
Change-Id: Ib7205e103a93c559ef2fc50921248699e9457a62
Fixes: 28813950
 2016-05-31 14:02:19 -07:00
Adrian Roos
a8231efd8f Merge "Fix crash with intent-less actions" into nyc-dev 
am: ac2b44f502

* commit 'ac2b44f5021f6d863c37167b26fe7dfba9bc4c6f':
  Fix crash with intent-less actions

Change-Id: Ia0835af917c5818ec90fc96691d512c98e89d7e0
 2016-05-31 20:59:16 +00:00
Adrian Roos
e090dcbc8a Merge "Fix crash with intent-less actions" into nyc-dev 
am: ac2b44f502

* commit 'ac2b44f5021f6d863c37167b26fe7dfba9bc4c6f':
  Fix crash with intent-less actions

Change-Id: Ifa3e489a206c04b43d9747bd260156e346111d3e
 2016-05-31 20:59:07 +00:00