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

274261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
9a7c3bd577 Merge "Add way to set live wallpaper across users" into nyc-mr1-dev 2016-07-15 21:07:31 +00:00
Ashutosh Joshi
118644056f Loading NanoApps now works. 
Fixing transaction handling for loading/unloading nanoApps.

Bug: 30165105
Change-Id: I540243d730040e70b2d104ccd9ea5a0baaa0d97d
 2016-07-15 13:46:22 -07:00
TreeHugger Robot
1fa74491cc Merge "Remove vestigial config setting." 2016-07-15 20:42:17 +00:00
Cheryl Potter
a5d5bbbd37 docs: Add redirect for new AS Help menu item 
b/30165151

Change-Id: I23cebb22ab697f750846cccb2eb42088a22f1cc9
 2016-07-15 13:41:57 -07:00
Kevin Hufnagle
72984dd772 Merge \\\"docs: Added note about limited support for hardware key attestation\\\" into nyc-dev am: 68b98bc608 am: 6198b6cdfb 
am: ed5ce4a792

Change-Id: I1f1f767781c93166cb085ebaed32036aee367f05
 2016-07-15 20:30:22 +00:00
Makoto Onuki
a97256b793 Fix the allowed icon type error message 
Bug 30162778

Change-Id: I925c563c1924c6525fe17afc44626d62864ba7e1
 2016-07-15 13:23:54 -07:00
Kevin Hufnagle
9b31137e0a Merge \\\"docs: Added note about limited support for hardware key attestation\\\" into nyc-dev am: 68b98bc608 am: 6198b6cdfb 
am: eb6124cbaf

Change-Id: I424b5a33d00437e9092e3aa681d9b5fa5524dd63
 2016-07-15 20:19:23 +00:00
Vladislav Kaznacheev
f2034d6455 Merge \\"Always return valid ClipDescription for ACTION_DRAG_EXITED\\" into nyc-mr1-dev am: 278676bdeb 
am: b604ade452

Change-Id: Ie779f0a6ca15f6f190a6361bddc4982b522004cd
 2016-07-15 20:19:20 +00:00
Chong Zhang
b082d7d63f Merge \\"Don\\'t release surface if relayout is visible\\" into nyc-mr1-dev am: 465376c5ae 
am: 8e8c07cd2e

Change-Id: Icbd15f921c450c4951f6cfaa345c1746e560600c
 2016-07-15 20:19:18 +00:00
Adrian Roos
69dc1232cf Merge \\"Add ApplicationErrorReport tests\\" into nyc-mr1-dev am: f86d855125 
am: 4b39cfe203

Change-Id: I6510e4bb75e0780baef8e7a80622d8bbad9a932a
 2016-07-15 20:19:15 +00:00
Ruben Brunk
459b0192e5 Merge \\"Remove VR package disable logic.\\" into nyc-mr1-dev am: b005e0685f 
am: b983261885

Change-Id: I49e7e868ea5ca1db3ba6efba25027ecb3874f6e5
 2016-07-15 20:19:12 +00:00
Android Build Merger (Role)
dbf1504128 Merge "Merge \\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\" into nyc-dev am: 344a7375d7 am: d5b43852dc" into nyc-mr1-dev-plus-aosp 2016-07-15 20:17:36 +00:00
Dan Yu
dc1a984b49 Merge \\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\" into nyc-dev am: 344a7375d7 
am: d5b43852dc

Change-Id: I54158112da7872a7968cd4661c4f321ca459c9db
 2016-07-15 20:17:01 +00:00
Chris Tate
312b39ac91 Merge \\"Turn down restore-time logspam\\" into nyc-mr1-dev am: a46b7f44c0 
am: c577b1be52

Change-Id: I86397a6cc792bbcf7c3c86e720446093f630aca7
 2016-07-15 20:16:53 +00:00
Bert McMeen
682e5cc8e7 Merge \"Docs: Behavior changes such as activity dismissal am: f506485b51 am: 274d904d4c am: 8432d4328d am: 5c7a3e4867\" into nyc-mr1-dev-plus-aosp 
am: 0a7063a2a0

Change-Id: I3542cbbd52bf1bf21d7209a5292d4b68268243ef
 2016-07-15 20:16:50 +00:00
Bert McMeen
34f95e6c38 Docs: Behavior changes such as activity dismissal am: f506485b51 am: 274d904d4c am: 8432d4328d am: e6430efbcf 
am: 9b6a7ee515

Change-Id: I3b0d0a63146f2919236737ec4ac8811240068518
 2016-07-15 20:16:47 +00:00
Jason Monk
b55c3c60a8 Merge \\"QS: Don\\'t use ComponentName to identify tiles\\" into nyc-mr1-dev am: a0967ebbdf 
am: 356d4914b2

Change-Id: I83fad6237edfb9516e1fe40612b820c319f26cc5
 2016-07-15 20:16:44 +00:00
Esteban Talavera
be2612f415 Merge \\"Disallow user to block notification from OobConfig\\" into nyc-mr1-dev am: 28763c5a77 
am: 65aeef9d87

Change-Id: I466d5bbf617e50f85ef3b63564ee1945f64710f2
 2016-07-15 20:16:39 +00:00
Dan Yu
79b1bb4878 Merge \\"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\\" into nyc-dev am: 344a7375d7 
am: 7b10126ed6

Change-Id: I3e28ba70ad33d32b293c9f11b5a5110e0e8a5fc7
 2016-07-15 20:15:40 +00:00
Mike Tsao
fc47ba75e4 Back up Night Light settings 
Bug: 30150787
Change-Id: I79697b41b68e0f123de20e7b8782c6058bef7977
 2016-07-15 13:12:17 -07:00
Daniel Yu
d5b43852dc Merge \"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\" into nyc-dev 
am: 344a7375d7

Change-Id: Ia090eda73ad984c7e15a94c9b318e3a314fe0582
 2016-07-15 20:09:41 +00:00
Daniel Yu
7b10126ed6 Merge \"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\" into nyc-dev 
am: 344a7375d7

Change-Id: I9f05ab3452788942b6fc3e0d45ed92e0e5401ea6
 2016-07-15 20:09:34 +00:00
Jason Monk
4acd59baf9 Merge "resolve merge conflicts of 4481b51 to master" 2016-07-15 20:08:41 +00:00
Svet Ganov
cd263d56d2 Merge \"Prevent apps to overlay other apps via toast windows\" into nyc-mr1-dev 
am: e2d148b008

Change-Id: I73f802b9b1c4acd5b17c706372f42c9e5d388840
 2016-07-15 20:03:33 +00:00
Andreas Gampe
37e5fdc6b4 Frameworks/base: Add compiler stats to Package Manager 
Add a simple class for storing compiler statistics. Capture compile
times for code paths from a package.

Bug: 29223204
Change-Id: I1b066de6a83a739470a42480eee0bfef88423eea
 2016-07-15 13:02:35 -07:00
Dan Yu
344a7375d7 Merge "docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5" into nyc-dev 2016-07-15 19:59:57 +00:00
Makoto Onuki
1030520822 Cache the default launcher. 
Originally we always checked with PM for the default launcher,
which would take ~2ms.

Now we cache the result, and clears the cache when (any) preferred
activities change.

Bug 30126557

Change-Id: Iceef288cd372c8bb9b119aa493e5173d894f2302
 2016-07-15 12:57:03 -07:00
Svetoslav Ganov
e2d148b008 Merge "Prevent apps to overlay other apps via toast windows" into nyc-mr1-dev 2016-07-15 19:56:42 +00:00
Jason Monk
b3bbcf256f Merge \"Reduce contention of ApplicationsState locks\" into nyc-mr1-dev 
am: 9e133205e3

Change-Id: I3ac7fca652b60ebc66e8804e31c8cfd034b8b037
 2016-07-15 19:55:45 +00:00
TreeHugger Robot
9e133205e3 Merge "Reduce contention of ApplicationsState locks" into nyc-mr1-dev 2016-07-15 19:52:09 +00:00
Junda Liu
199290cdab Merge \"Add carrier config to report IMEI on CDMA phone.\" into nyc-mr1-dev 
am: a5b923bdd7

Change-Id: I383718bd1e756f560485b12259f6a5c98dc8a8f6
 2016-07-15 19:50:46 +00:00
Vineeta Srivastava
a5b923bdd7 Merge "Add carrier config to report IMEI on CDMA phone." into nyc-mr1-dev 2016-07-15 19:44:45 +00:00
Chad Brubaker
08d6e20230 Merge "Mention target API limits for ACTION_STORAGE_CHANGED" 2016-07-15 19:33:14 +00:00
Steve McKay
1d389a543e Remove vestigial config setting. 
Change-Id: I8cd1558ae76833d4f0e511f05fc6e66d9ff44a7e
 2016-07-15 19:22:58 +00:00
Kevin Hufnagle
b9d34b3877 Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am: 68b98bc608 
am: 7703ce2d21

Change-Id: I1ec301fa937ef74193667f43891d8e0e09737dfd
 2016-07-15 19:12:28 +00:00
TreeHugger Robot
7703ce2d21 Merge "Align empty views for quicksetting center in detail panel." into nyc-mr1-dev 2016-07-15 19:08:12 +00:00
Android Build Merger (Role)
ed5ce4a792 Merge "Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am: 68b98bc608 am: ca5c7da9d0" into nyc-mr1-dev-plus-aosp 2016-07-15 19:07:02 +00:00
Kevin Hufnagle
8bee543a16 Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am: 68b98bc608 
am: ca5c7da9d0

Change-Id: I36f43c1094d90cf531c0d12b6b24a2d00236b0db
 2016-07-15 19:06:38 +00:00
Kevin Hufnagle
eb6124cbaf Merge \\"docs: Added note about limited support for hardware key attestation\\" into nyc-dev am: 68b98bc608 
am: 6198b6cdfb

Change-Id: Icce0f6f456fddc098597b7f656db368733250583
 2016-07-15 19:06:23 +00:00
Adam Lesinski
8fc5bfd47c Merge "Build SystemUI and Keyguard with AAPT2" 2016-07-15 19:06:11 +00:00
Junda Liu
276f4d648b Add carrier config to report IMEI on CDMA phone. 
Bug: b/29340579
Change-Id: I3cac49af4b173f971b8153c00227141378f32b43
 2016-07-15 12:04:24 -07:00
Kevin Hufnagle
ca5c7da9d0 Merge \"docs: Added note about limited support for hardware key attestation\" into nyc-dev 
am: 68b98bc608

Change-Id: I1ae42e82f830ac939491c7d754d71420ec2092d9
 2016-07-15 18:58:07 +00:00
Andrew Solovay
5ba9c49964 docs: Updating image download pages for DP5 
Updating with current images, which I've also uploaded to the cloud
share. I briefly made the cloud share public, so I could test the
download links and verify the checksums on the web page against the
downloaded files; the downloads and checksums all worked, so I made
the cloud files private again (so the links in these pages don't
work at the moment).

Also updated the download tables in the internationalized versions
of these files, since it's just a copy/paste.

See first comment for doc stage location.

bug: 29738757

Change-Id: I384786dcdf0dd249be0d1d0e38c88fa2b2109e0b
 2016-07-15 11:57:36 -07:00
Kevin Hufnagle
6198b6cdfb Merge \"docs: Added note about limited support for hardware key attestation\" into nyc-dev 
am: 68b98bc608

Change-Id: I07e7c0a91f7e75d5713b93aa27c06ef2631ea276
 2016-07-15 18:56:32 +00:00
Kevin Hufnagle
68b98bc608 Merge "docs: Added note about limited support for hardware key attestation" into nyc-dev 2016-07-15 18:44:12 +00:00
Daniel Yu
002031a540 docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() 
and Direct Boot for DP5

getStorageEncryptionStatus() now returns new
ENCRYPTION_STATUS_ACTIVE_PER_USER if the device is not
using direct boot (and the not-new ENCRYPTION_STATUS_ACTIVE
is returned if direct boot is used)

Bug: 30112425
Change-Id: I27c11b2afe2afd9a19c9f8268f486b09af22e6ac
 2016-07-15 11:41:59 -07:00
Vladislav Kaznacheev
b604ade452 Merge \"Always return valid ClipDescription for ACTION_DRAG_EXITED\" into nyc-mr1-dev 
am: 278676bdeb

Change-Id: I51a339a1a821439b5c90079812aea56833872b75
 2016-07-15 18:38:08 +00:00
Chong Zhang
8e8c07cd2e Merge \"Don\'t release surface if relayout is visible\" into nyc-mr1-dev 
am: 465376c5ae

Change-Id: I47d834d26cee248900d268bbe027ea82fd7c286a
 2016-07-15 18:37:59 +00:00
Adrian Roos
4b39cfe203 Merge \"Add ApplicationErrorReport tests\" into nyc-mr1-dev 
am: f86d855125

Change-Id: I57d00e200ebf03010fca4ae0753200b981faaad4
 2016-07-15 18:31:20 +00:00
TreeHugger Robot
278676bdeb Merge "Always return valid ClipDescription for ACTION_DRAG_EXITED" into nyc-mr1-dev 2016-07-15 18:26:51 +00:00