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

248131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
634ed6bc17 Merge changes Id876f01f,If7c94cf8 into nyc-mr1-dev 
* changes:
  Improving the Reset Demo Warning dialog
  Enabling auto-ota in retail demo mode
 2016-06-29 01:38:02 +00:00
TreeHugger Robot
2d8c91f238 Merge "Prevent PrintSpooler from being disabled" into nyc-mr1-dev 2016-06-29 01:29:41 +00:00
Chong Zhang
8e3b57aad5 Merge "Add a few trace points for animation loading." into nyc-mr1-dev 2016-06-29 01:03:27 +00:00
Jim Miller
ef26bf0f0a Merge \"Relax security constraint around getAuthenticatorId().\" into nyc-dev 
am: 60c04126c9

Change-Id: I28a3559159340d663693976cc58dc34f3c730f6c
 2016-06-29 00:45:08 +00:00
Jim Miller
60c04126c9 Merge "Relax security constraint around getAuthenticatorId()." into nyc-dev 2016-06-29 00:37:42 +00:00
Hugo Benichi
41a3acc55a Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev 
* changes:
  Add tests for MetricsLoggerService
  Tests for IpConnectivityMetricsLog
 2016-06-29 00:15:49 +00:00
Suprabh Shukla
0271fd661d Improving the Reset Demo Warning dialog 
Removing explicit call to setView which was distorting the layout
of a standard AlertDialog. Used the correct unicode characted for
apostrophe. Also removed calls to enable demo mode launcher for user 0.

Bug: 29520255
Change-Id: Id876f01f8e51c02634c03fce1ea93a15b111fc27
 2016-06-28 16:48:34 -07:00
Jim Miller
d0063106b6 Relax security constraint around getAuthenticatorId(). 
Fixes bug 28603656

Change-Id: I54216d4b9a3ab23f9d5bfe0f40f2dd27e723c21e
 2016-06-28 16:43:57 -07:00
Philip P. Moltmann
545a58ab6b Prevent PrintSpooler from being disabled 
Change-Id: I40fb7b25174a41d04f767fbf8ee1da8c02e7156a
Fixes: 29830022
 2016-06-28 23:28:48 +00:00
Ajay Panicker
58dd0cd65e Protect REFRESH_BATCHED_SCAN broadcast 
Bug: 29754520
Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37
 2016-06-28 23:20:37 +00:00
Chong Zhang
8784be6fe4 Add a few trace points for animation loading. 
Also make sure focusMayChange is set as before commit 8c5d42.
We only want to skip the applyAnimationLocked if animation is
already set, make sure the rest are equivalent.

bug: 29405575

Change-Id: I8342b82d9e6e02fab002e16ffcde4a7479bf6867
 2016-06-28 16:09:35 -07:00
Lajos Molnar
a1df385e74 Merge \"media: document VP9 CSD for MediaCodec\" into nyc-dev 
am: 1fe8871f04

Change-Id: I5f95ce25ee8099c556f04245291da8345df42584
 2016-06-28 22:32:01 +00:00
Lajos Molnar
1fe8871f04 Merge "media: document VP9 CSD for MediaCodec" into nyc-dev 2016-06-28 22:27:53 +00:00
Lajos Molnar
eb6fac8029 Merge \"media: document rotation and scaling issues for MediaCodec\" into nyc-dev 
am: af9d9f9b3e

Change-Id: Ie9d890df1b77c8fd79766e5ea329e5f8db4a94eb
 2016-06-28 22:26:44 +00:00
Lajos Molnar
ac43565741 Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev 
am: 556e012979

Change-Id: I248fbd3da8dd0376d724ca8aee7f8e71bfb260b0
 2016-06-28 22:26:42 +00:00
Lajos Molnar
af9d9f9b3e Merge "media: document rotation and scaling issues for MediaCodec" into nyc-dev 2016-06-28 22:21:02 +00:00
Lajos Molnar
556e012979 Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc-dev 2016-06-28 22:19:30 +00:00
Suprabh Shukla
f8c04cbe95 Enabling auto-ota in retail demo mode 
Bug: 29542384
Change-Id: If7c94cf8a8e5851011f23dc5d64fc795f9a07b22
 2016-06-28 14:38:29 -07:00
Oren Blasberg
9585012ce3 Merge \"Fix popup context menu appearing brokenly.\" into nyc-dev 
am: 29ea814354

Change-Id: I1fdc4c75bf763a3e0c1411230e5a0cdc21ad882a
 2016-06-28 21:20:02 +00:00
Oren Blasberg
29ea814354 Merge "Fix popup context menu appearing brokenly." into nyc-dev 2016-06-28 21:12:28 +00:00
Android Build Merger (Role)
b1400b142e Merge "Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev am: c1374208e3" into nyc-mr1-dev 2016-06-28 20:49:14 +00:00
Felipe Leme
1cec26c69e Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev 
am: c1374208e3

Change-Id: Ie02a847ac513f89c1c430af0e3f559cf0bc2039d
 2016-06-28 20:48:51 +00:00
TreeHugger Robot
23bc74a8d5 Merge "Define deprecated fields in IntDef's" into nyc-mr1-dev 2016-06-28 20:48:37 +00:00
TreeHugger Robot
c1374208e3 Merge "Remove redundant setPendingIntentWhitelistDuration() calls." into nyc-dev 2016-06-28 20:45:40 +00:00
TreeHugger Robot
9d07eed168 Merge "Show notification while PRE_BOOT receivers run." into nyc-mr1-dev 2016-06-28 20:18:59 +00:00
Oren Blasberg
0e8ce872f1 Fix popup context menu appearing brokenly. 
Add missing attribute to the base Theme to ensure the context menu
does not appear completely invisibly.

Bug: 29796385
Change-Id: I4f50579622e97656e09a5ddb6e13313f84efc972
 2016-06-28 12:41:30 -07:00
Felipe Leme
ef5c3aad4d Merge \"Fixed whitelistManager set on unbindServiceLocked()\" into nyc-dev 
am: 8d78c33c9b

Change-Id: I0339e6ae9261b1ebdd7bbed54540ca253b1b6fd9
 2016-06-28 19:22:23 +00:00
Todd Kennedy
a1066ed6c2 Merge \"Default minSdkVersion to \'1\'\" into nyc-dev 
am: a98e3e3ede

Change-Id: I8d2b7205f80b3cae5dce04839890df6aafa8449e
 2016-06-28 19:16:40 +00:00
TreeHugger Robot
8d78c33c9b Merge "Fixed whitelistManager set on unbindServiceLocked()" into nyc-dev 2016-06-28 19:15:34 +00:00
Todd Kennedy
1f397f4e7b Define deprecated fields in IntDef's 
Tools need all of the valid constants to handle legacy apps; even
though we want developers to use the new constant names.

Bug: 29824931
Change-Id: I5f8055d50d1d3f32cfbed7459d8a497cfbd3661e
 2016-06-28 12:14:11 -07:00
TreeHugger Robot
a98e3e3ede Merge "Default minSdkVersion to '1'" into nyc-dev 2016-06-28 19:12:49 +00:00
TreeHugger Robot
41f0e20739 Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc-mr1-dev 2016-06-28 18:54:24 +00:00
Jeff Sharkey
c4bcacb98e Show notification while PRE_BOOT receivers run. 
Awhile back, we switched to running PRE_BOOT receivers after the user
is unlocked.  Since these receivers include providers like Contacts
and MediaStore that can take a long time to upgrade, it may result in
apps like Dialer or Photos appearing to hang, so we need to help the
user understand that the system is still upgrading in the background.

Bug: 28164677
Change-Id: I18448534b6067f8508b1ffb2d43c106c02c265a0
 2016-06-28 12:51:58 -06:00
Felipe Leme
dd85da6e94 Remove redundant setPendingIntentWhitelistDuration() calls. 
Since all pending intents are stored on a Set in the Notication object,
there is no need to individually check for specific pending intents.

BUG: 29480440
Change-Id: I27a18bb535a9a4bb6cb4e76bdc189e6c315a684a
 2016-06-28 11:34:54 -07:00
TreeHugger Robot
694acb1e36 Merge "Clip GradientDrawable's saveLayer" into nyc-mr1-dev 2016-06-28 18:24:25 +00:00
Philip P. Moltmann
fd28d8ebd1 Merge "Always reload print services" into nyc-mr1-dev 2016-06-28 18:15:38 +00:00
Felipe Leme
a7778b0654 Fixed whitelistManager set on unbindServiceLocked() 
It must call updateWhitelistManagerLocked() because the app might have
other services with the whitelistManager set, in which case the process
record should not have whitelistManager reset.

Fixes: 29480440

Change-Id: I268278c646aaa89a352f02178b294c02c3c11d35
 2016-06-28 10:41:45 -07:00
Lajos Molnar
4461356ea8 media: document rotation and scaling issues for MediaCodec 
Bug: 23709311
Bug: 28512795
Change-Id: Iddebd13b4cd4c50bca8736d3aca71571ad16633a
 2016-06-28 10:38:34 -07:00
Chris Craik
754ea612ec Merge "Fix savelayer rounding" into nyc-mr1-dev 2016-06-28 17:33:27 +00:00
Todd Kennedy
4f6570878c Default minSdkVersion to '1' 
Exception when targetSdkVersion is a letter API [eg 'N']. While this
is technically not according to the external docs, it's the behaviour
with prior platforms.

Bug: 29817839
Change-Id: I8382909dbe62de7b2ddfb7995ce11d5c2f43372e
 2016-06-28 10:31:05 -07:00
Allen Hair
fb20170c0f Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev 
am: 15783f0073

Change-Id: I9439934c0fff5c0e23fe0000252c8781f0540a81
 2016-06-28 17:30:21 +00:00
Allen Hair
15783f0073 Merge "Add a flag to enable instrumentation of the framework classes." into nyc-dev 2016-06-28 17:23:55 +00:00
Lajos Molnar
db56549ff2 media: document format keys for MediaExtractor/CodecCapabilities 
Bug: 29618892
Change-Id: I78049997c153fe00fbcf4475eeefdc937de284dd
 2016-06-28 17:20:09 +00:00
Chris Craik
e4f6d968f5 Fix savelayer rounding 
bug:29456451

Change-Id: I8022163d2c004510da5db74efdca27582484224d
 2016-06-28 09:53:04 -07:00
Chris Craik
1e5d428b3f Clip GradientDrawable's saveLayer 
bug:29456451

Avoid using very expensive unclipped saveLayer codepath.

Change-Id: Ib96a46169faa89eda6889b16813a7941ab402779
 2016-06-28 09:45:35 -07:00
Daniel Yu
82bd5246e7 Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev 
am: 6ec78a6458

Change-Id: Ie77c87f366c21acb05afcf5d03ddc6d75e9b950a
 2016-06-28 16:28:24 +00:00
Dan Yu
6ec78a6458 Merge "resolve merge conflicts of ac5b340 to nyc-dev" into nyc-dev 2016-06-28 16:21:57 +00:00
Philip P. Moltmann
c7c647bbf0 Merge "Syncronize renderPage vs. onServiceDisconnected" into nyc-mr1-dev 2016-06-28 16:14:32 +00:00
TreeHugger Robot
5b2fd818a0 Merge "media: document VP9 CSD for MediaCodec" into nyc-mr1-dev 2016-06-28 15:56:42 +00:00
Shreyas Basarge
5098fe97d6 Merge \"SyncOperation float cast fix\" into nyc-dev 
am: 5f72b129c4

Change-Id: I50ab6249e81ff7523a82f26bd39b52bb362f4ae4
 2016-06-28 15:43:00 +00:00