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
Jaewan Kim
c21fa8c3f6 Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad 
am: 74ebf3ec67

* commit '74ebf3ec67ddbbf7752da120a57c4624d4e1655f':
  Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x

Change-Id: I6c01fb9689735a6214bd9f3b29d4dd50a8744388
 2016-05-24 00:35:36 +00:00
Android Build Merger (Role)
36cd971997 Merge "Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad am: 938c4e3564" into nyc-mr1-dev-plus-aosp 2016-05-24 00:31:07 +00:00
Jaewan Kim
9a6f0098ba Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad 
am: b917a0e6be

* commit 'b917a0e6be841d23ff56c54b03abb42b3a93d930':
  PIP: Handle configuration changes

Change-Id: I018fc45368eff5fbe9ba5d6f21b00d616e622010
 2016-05-24 00:30:38 +00:00
Dianne Hackborn
74ebf3ec67 Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev 
am: 9c252700f6

* commit '9c252700f6686767f5418677800ba171f441dddc':
  Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x

Change-Id: Ib2811fb49299da93459066d9d6312d403681eed4
 2016-05-24 00:30:32 +00:00
Jaewan Kim
201f814231 Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad 
am: 938c4e3564

* commit '938c4e356417360e161dcf7a9eba2524f13373f0':
  PIP: Handle configuration changes

Change-Id: Ida8a222a813f462e3b6766c572d53ffcf7995e78
 2016-05-24 00:30:32 +00:00
Dianne Hackborn
f7003f512f Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev 
am: 9c252700f6

* commit '9c252700f6686767f5418677800ba171f441dddc':
  Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x

Change-Id: I9f3aa6eedbf66eceee0fcaed95a862bea656e359
 2016-05-24 00:30:30 +00:00
Hang Yin
3ed27cc2b2 Created 4 camera preview stress test cases. 
The 4 stress test cases cover situations of preview switch between
front/back camera and between photo/video mode. Followed Google
Camera App Kenai version streaming rules to set preview request in
the tests.

b/28916141 will be solved once this change is merged

Change-Id: I448be429df5b0813fa2e2f6ff05ad2936afee1b3
 2016-05-23 17:29:28 -07:00
Jaewan Kim
b917a0e6be Merge "PIP: Handle configuration changes" into nyc-dev 
am: 75822138ad

* commit '75822138ad7f676592c5655df96fe76200b6ffb3':
  PIP: Handle configuration changes

Change-Id: I976b3e89aa4bc255138f411c855ab0ad1d8c50bd
 2016-05-24 00:22:31 +00:00
Jaewan Kim
938c4e3564 Merge "PIP: Handle configuration changes" into nyc-dev 
am: 75822138ad

* commit '75822138ad7f676592c5655df96fe76200b6ffb3':
  PIP: Handle configuration changes

Change-Id: Ic01a93b2031693b9051312598c084e871d84fedc
 2016-05-24 00:22:27 +00:00
Amith Yamasani
f5c37eb3b7 Use correct synchronization lock 
This is to fix an incorrect unregister() that was crashing
the system server. The only way it could be happening is
because of incorrect locking. So, hopefully this fixes it.

Bug: 28813750
Change-Id: Ie3c47ffa3024a0c533e12db0d2d021df8fc0367a
 2016-05-23 17:21:08 -07:00
Dianne Hackborn
9c252700f6 Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev 2016-05-24 00:18:39 +00:00
Jaewan Kim
75822138ad Merge "PIP: Handle configuration changes" into nyc-dev 2016-05-24 00:05:27 +00:00
Erik Kline
2709307ac3 Merge "Merge "Support DHCPv4 rebinding state" into nyc-dev am: 4bf3157c45 am: b21c227a39" into nyc-mr1-dev-plus-aosp 
am: 11513935f6

* commit '11513935f6e2fd61909c9735ed7fff1c551748d2':

Change-Id: I53d705f84cceeee811d8771f278dba87b4f09f4c
 2016-05-23 23:52:34 +00:00
Erik Kline
17d73444ef Merge "Support DHCPv4 rebinding state" into nyc-dev am: 4bf3157c45 am: 648d51fc5d 
am: 9beb742614

* commit '9beb7426141e9b087ed0d1b521239da748442514':
  Support DHCPv4 rebinding state

Change-Id: I43ff1d2539473768b489c59d32b2cbfa38271521
 2016-05-23 23:52:16 +00:00
Selim Cinek
c22fff6cf6 Added accessibility action for scrolling the notifications 
Also made the stackscroller focusable if and only if it is
scrollable. This will allow it to be important for accessibility
again.

Change-Id: I7773ed3a19d23f6bc62a1b9a23464cfbecd0ec03
Fixes: 25673942
 2016-05-23 16:51:16 -07:00
Chong Zhang
616c7c10b9 Fix wallpaper crop during unlock animation 
Do not crop wallpaper if the wallpaper target is animating but stack
clip mode is not STACK_CLIP_AFTER_ANIM. We can't crop wallpaper with
final bounds as the crop needs to apply before the transform.

bug: 28887408
Change-Id: I62b9a5ca818c3ca8d0af26d807318f63747b8ac4
 2016-05-23 16:48:12 -07:00
Fyodor Kupolov
ad9ac22ac3 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e am: 3067da37c1 
am: a371f51aab

* commit 'a371f51aab55c35d6b804acd1e23330d3fe59fc9':
  Additional clean up in onUserRemovedLPw

Change-Id: I28d6928d630538752a4f336109f3bd2582a0c7c8
 2016-05-23 23:38:37 +00:00
Adrian Roos
4be7eaeb9a Merge "Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e am: 6d2e1e45f0" into nyc-mr1-dev-plus-aosp 
am: dcefb83576

* commit 'dcefb835760bf0a4ec958cb9406bb616747c54d3':

Change-Id: I77643100ed7724ebbc8a8d2480beceab8f27e324
 2016-05-23 23:38:33 +00:00
Android Build Merger (Role)
11513935f6 Merge "Merge "Support DHCPv4 rebinding state" into nyc-dev am: 4bf3157c45 am: b21c227a39" into nyc-mr1-dev-plus-aosp 2016-05-23 23:38:30 +00:00
Adrian Roos
8406ea9c7b Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e am: 80c470bd52 
am: ddaa2e1fec

* commit 'ddaa2e1fec45287f7099120f0b6e75aed9e4c10d':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: Iaea682e2a45c35d9114466d010c98c120e8847c9
 2016-05-23 23:38:16 +00:00
Erik Kline
368b21f7d6 Merge "Support DHCPv4 rebinding state" into nyc-dev am: 4bf3157c45 
am: b21c227a39

* commit 'b21c227a39df2bec9488e9eabec9dfe6e34b9bb5':
  Support DHCPv4 rebinding state

Change-Id: Ib880d8bdd9230b76247ffadeef66b2a11dae2435
 2016-05-23 23:37:58 +00:00
Erik Kline
9beb742614 Merge "Support DHCPv4 rebinding state" into nyc-dev am: 4bf3157c45 
am: 648d51fc5d

* commit '648d51fc5dfcbb7c9b33f247eb0b32631d34835d':
  Support DHCPv4 rebinding state

Change-Id: I171247f1a930f97b361a774f74a90b29aad84fc7
 2016-05-23 23:37:42 +00:00
Dianne Hackborn
aa9a59d410 Work on issue #27995384: Time in the top bar different... 
...from time in the clock app

Always reset the kernel's next wake up time when we come
out of it, even if it didn't say an alarm went off.

Also add some more debugging to try to figure out what is
going on.

Change-Id: Ibf36d65b78c841128774d81517a7eb670c396c29
 2016-05-23 16:34:16 -07:00
Hui Shu
9ee6bdfe61 Make getMinimumVersionCode thread safe. 
The method is not thread safe when there are multiple available-by-default,
non-fallback WebView provider packages with different versions, because it sets
mMiniumVersionCode multiple times during the for loop, when another thread might
be reading the intermediate mMinimumVersionCode.

BUG: 28916406
Change-Id: I826c79f108b114c42c7bcd91fc198212c9ab09ad
 2016-05-23 16:29:41 -07:00
Erik Kline
648d51fc5d Merge "Support DHCPv4 rebinding state" into nyc-dev 
am: 4bf3157c45

* commit '4bf3157c4560148b9b3f2e6aec7ed0835f6af14a':
  Support DHCPv4 rebinding state

Change-Id: I885181616444d19974085637f80f459c9152ac7d
 2016-05-23 23:29:07 +00:00
Erik Kline
b21c227a39 Merge "Support DHCPv4 rebinding state" into nyc-dev 
am: 4bf3157c45

* commit '4bf3157c4560148b9b3f2e6aec7ed0835f6af14a':
  Support DHCPv4 rebinding state

Change-Id: If31de53174e64e154152b7baa60f23a387092e87
 2016-05-23 23:28:57 +00:00
Adrian Roos
a371f51aab Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e 
am: 3067da37c1

* commit '3067da37c1e945245274ae638373f200d0ff2d29':
  Additional clean up in onUserRemovedLPw

Change-Id: I845144d4487a39973427f39c0b93b5a8acbc9f9b
 2016-05-23 23:28:37 +00:00
Android Build Merger (Role)
dcefb83576 Merge "Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e am: 6d2e1e45f0" into nyc-mr1-dev-plus-aosp 2016-05-23 23:24:33 +00:00
Adrian Roos
5292172fb4 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e 
am: 6d2e1e45f0

* commit '6d2e1e45f008f1f179fee4d5c966dfdbb31b45ed':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I7c420fe8cf54cb3e08341a073d5abd7ce0d0ebd7
 2016-05-23 23:23:55 +00:00
Adrian Roos
ddaa2e1fec Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e 
am: 80c470bd52

* commit '80c470bd52af8b5db26cc0aae24da10135883c0d':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I9a4309d22dbc58081387771ec228c32e2db2cf84
 2016-05-23 23:23:40 +00:00
Erik Kline
4bf3157c45 Merge "Support DHCPv4 rebinding state" into nyc-dev 2016-05-23 23:19:04 +00:00
Fyodor Kupolov
3067da37c1 Merge "Additional clean up in onUserRemovedLPw" into nyc-mr1-dev 2016-05-23 23:18:16 +00:00
Adrian Roos
6d2e1e45f0 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 
am: d15cc7a83e

* commit 'd15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I584f2e8ce46358ecdcb1189f3e46400d6f07d346
 2016-05-23 23:15:29 +00:00
Adrian Roos
80c470bd52 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 
am: d15cc7a83e

* commit 'd15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I35dac10df46e313fbe013fcc09337f8e9ac95890
 2016-05-23 23:14:35 +00:00
TreeHugger Robot
58fe2cad18 Merge "Fix RemoteViewsTests" 2016-05-23 23:09:41 +00:00
TreeHugger Robot
d15cc7a83e Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 2016-05-23 23:04:36 +00:00
Christopher Tate
647cb6a6d8 DO NOT MERGE : backport of backup transport whitelist 
Sysconfig define a whitelist of permitted backup transports

Previously any apk bundled in priv-app could insert a backup transport.
Reduce risk surface by giving the OEM explicit control over who is
allowed to handle backup data.

Bug 28406080

Backport of 494df79172 from N

Change-Id: I405b49daee8c576584575c3e46877cc97632d8c6
 2016-05-23 15:37:57 -07:00
Chad Brubaker
80fd4e1292 Fix incorrect cleartext attribute 
Bug: 28914756
Change-Id: Icb3b34b8b088eb8c03eb0b7049670df6d65973f9
 2016-05-23 15:30:52 -07:00
Wei Liu
4e62ac5eef Disable WiFi p2p service if it's not supported. 
b/26877020

Change-Id: I84b822fa57423711de75d2147effe73a1fc40eb4
 2016-05-23 22:25:51 +00:00
Jean-Michel Trivi
d6de352fdd Merge "Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 am: 7399079b5b" into nyc-mr1-dev-plus-aosp 
am: f53e945c5c

* commit 'f53e945c5c33b110cff539b9d4ae6c59567b789d':

Change-Id: I09dd248ff1b5216c49f92df6a5cae5e8efb91c50
 2016-05-23 22:18:46 +00:00
Wale Ogunwale
62c46b9112 Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev am: 42d4a337a3 am: 22ff8d0779 
am: 51fb90bf29

* commit '51fb90bf294c4162da69587213d5a4031204bcfe':
  Only resuming starting dontWaitForPause activity once

Change-Id: Ibd763abadf8625607187c1ab22de445b57752730
 2016-05-23 22:18:39 +00:00
Jean-Michel Trivi
9dff90a539 Merge "Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 am: bbcf18dbfd" into nyc-mr1-dev-plus-aosp 
am: 6252410588

* commit '62524105885ba05e320d4880ce42a44f12323e96':

Change-Id: I25247605e47b4f9ee60db5fc3b8108e89a2478c5
 2016-05-23 22:14:06 +00:00
Etan Cohen
93d3c79b54 [NAN] Add retry count for transmitting L2 NAN messages 
Bug: 28690414
Change-Id: I0a253f6d7e0d15f4bb50cae685c5e2496682cd67
 2016-05-23 15:07:47 -07:00
Selim Cinek
954cc230ed Fixed a bug where the text directionality was inconsistent 
The title would not be fully right aligned because it wasn't
layouted with match_parent because there could be a second visible
text when there is a progressbar.

Change-Id: I73d97d9a8addaec0e3b849349f220c764fa45db0
Fixes: 27893267
 2016-05-23 15:00:22 -07:00
Jean-Michel Trivi
2941387f5c Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 am: f2c8fb8620 
am: 740c0424f0

* commit '740c0424f0a817746c6071942a6563a603649697':
  Recording activity notification: return list of configuration

Change-Id: I3289964e2ceaeb999803abc1f5d485857a80894b
 2016-05-23 21:59:29 +00:00
Jason Monk
e86c588c56 Merge "Make battery labels translatable." into nyc-dev am: 14abed66d7 am: ae8b7259f5 
am: 4494879fb7

* commit '4494879fb73f5e3d6bab056bd3cd4f36f2fe80de':

Change-Id: Ic0a961660ff83404e87e08fc288e2c7e02e332c6
 2016-05-23 21:59:05 +00:00
Jason Monk
e9cffb7399 Merge "Merge "Make battery labels translatable." into nyc-dev am: 14abed66d7 am: 7143013049" into nyc-mr1-dev-plus-aosp 
am: 620b410547

* commit '620b410547ef6fe81b298c03f5e8275043c9b1c3':
  Make battery labels translatable.

Change-Id: I21109db00aedaada100d4cc2664a9ca05084da3b
 2016-05-23 21:58:50 +00:00
Sid Soundararajan
c390b87f60 Merge "Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am: 0513125c92 am: 7f26540426" into nyc-mr1-dev-plus-aosp 
am: 71a9b4cb59

* commit '71a9b4cb5967754340a4a81ab54f9725c1e48839':

Change-Id: I5b0ad5837f4cd1b9bac7bd8368266c11a363ba84
 2016-05-23 21:58:34 +00:00
Sid Soundararajan
1eef8d615c Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am: 0513125c92 am: 809bb0f195 
am: 20c4aea8c5

* commit '20c4aea8c52fbb6ad1ea3ef74aee6ffc532749a4':
  Add a check to adjust thumbnail scaling for full screen shots on TV

Change-Id: I8372ba24c7bb352d6a7e1cee6364db7f8f1ae683
 2016-05-23 21:58:16 +00:00
Joe Onorato
93528031ed Merge "Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971 am: 97cdd11f2a" into nyc-mr1-dev-plus-aosp 
am: 29edf05f2a

* commit '29edf05f2aa7b05143e4bd6c12a1cbcea4f80c20':

Change-Id: I8c10f00cdbad765af2701c566d253ac637ffcf99
 2016-05-23 21:55:24 +00:00