Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,323 Commits 3 Branches 0 Tags
dd86aa141e02ffaf277996fc1701141ea13e090e
Commit Graph

245323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mahaver Chopra
dd86aa141e Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev 2016-05-24 12:22:51 +00:00
Mahaver Chopra
830e32cdcc Disallow OEM unlock when DISALLOW_FACTORY_RESET applies 
Bug: 28339424
Change-Id: I4b6dc6f186ea60a13e778f52d574e615b0b19b74
 2016-05-24 12:03:40 +00:00
Gustav Sennton
a44129dd55 Merge "Load WebView even if WebView relro creation times out." into nyc-dev 
am: a2fbfbce9e

* commit 'a2fbfbce9ef09ed7a98222e67709aa086e548c79':
  Load WebView even if WebView relro creation times out.

Change-Id: Icf6e99e3f3dfc9b1f4244f5da63e32b3d741459c
 2016-05-24 10:46:16 +00:00
Gustav Sennton
a2fbfbce9e Merge "Load WebView even if WebView relro creation times out." into nyc-dev 2016-05-24 10:39:32 +00:00
Lorenzo Colitti
09a2690f91 Merge "Support IPv6 multicast filtering in APF." into nyc-dev 
am: d954c6368f

* commit 'd954c6368fc6e591385e608fa6ebb42dc7606074':
  Support IPv6 multicast filtering in APF.

Change-Id: I6123c2390aa9641652fd200adcc16f9724799aab
 2016-05-24 03:19:29 +00:00
Lorenzo Colitti
d954c6368f Merge "Support IPv6 multicast filtering in APF." into nyc-dev 2016-05-24 03:14:38 +00:00
Pavlin Radoslavov
c6a3503100 Reduced the impact of "synchronized" statements 
am: eb50a39e98

* commit 'eb50a39e98acb78d16465041bb5c172aa1637e97':
  Reduced the impact of "synchronized" statements

Change-Id: I272dba69e9011720356a3c5b9ca849de281f5027
 2016-05-24 02:34:23 +00:00
TreeHugger Robot
a09c9e0fc4 Merge "Adding RetailModeService to handle retail mode" into nyc-mr1-dev 2016-05-24 02:24:50 +00:00
Pavlin Radoslavov
eb50a39e98 Reduced the impact of "synchronized" statements 
* Removed "synchronized" statements that are not needed
* Replaced "synchronized" statements with Read/Write lock as
 appropriate. The lock protects the access to and the setting of
 BluetoothAdapter.mService and BluetoothManagerService.mBluetooth and
 associated state.

Bug: 28734075
Bug: 28799467
Change-Id: I8f8281c505f0a1ae0add1e14a3caba1f5b2a98e4
 2016-05-24 01:17:29 +00:00
Suprabh Shukla
cc30b0e790 Adding RetailModeService to handle retail mode 
The service listens for the global setting DEVICE_DEMO_MODE and switches
device to demo mode when it is changed to 1. Also, acquires the wakelock
to
keep the screen on and puts up a notification to wipe and reset the demo
session when in demo mode.

Bug: 27280140
Change-Id: If1843016889ec2c50818c67432d60f33063e0986
 2016-05-23 17:47:51 -07: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
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
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
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
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
TreeHugger Robot
d15cc7a83e Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 2016-05-23 23:04:36 +00:00
Dianne Hackborn
5035d29dcc Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x 
Uh, yeah.

Change-Id: I452187fcdda634ebf00e5d6bcaa45433f348c17e
 2016-05-23 14:39:45 -07:00
Fyodor Kupolov
6954259edb Additional clean up in onUserRemovedLPw 
mDefaultPermissionsGranted, mFingerprints should be cleaned up.

Bug: 28913107
Change-Id: I3758985fe742d38e43538b5221fc3f436c55cb16
 2016-05-23 14:22:38 -07:00
Adrian Roos
f5faf9db14 Deprecate unnecessairy Notification.Style constructors 
Change-Id: I7a15eaaac4f756d137483aec5f389951c5a7eecb
Fixes: 28775574
 2016-05-23 14:00:07 -07:00
Wale Ogunwale
22ff8d0779 Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev 
am: 42d4a337a3

* commit '42d4a337a3b1a14f4d9daf6eb8275a01ba20e680':
  Only resuming starting dontWaitForPause activity once

Change-Id: Idb9949737a0ee5cfbabd6fad532f24f7ec769ace
 2016-05-23 20:58:58 +00:00
Jean-Michel Trivi
f2c8fb8620 Merge "Recording activity notification: return list of configuration" into nyc-dev 
am: c991879f29

* commit 'c991879f29c399ad7ede2b5c2c82e2e748f5e0df':
  Recording activity notification: return list of configuration

Change-Id: I02faeadaae995371e2d723415f0b2e3a78f2c489
 2016-05-23 20:55:58 +00:00
TreeHugger Robot
42d4a337a3 Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev 2016-05-23 20:51:40 +00:00
Jean-Michel Trivi
c991879f29 Merge "Recording activity notification: return list of configuration" into nyc-dev 2016-05-23 20:49:30 +00:00
Jason Monk
7143013049 Merge "Make battery labels translatable." into nyc-dev 
am: 14abed66d7

* commit '14abed66d7a70c3fc8e063246e3f79a0a53dfcd3':
  Make battery labels translatable.

Change-Id: I634eca6f143a5a6d103f49107e57db879b2ca633
 2016-05-23 20:03:51 +00:00
Sid Soundararajan
7f26540426 Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev 
am: 0513125c92

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

Change-Id: I057727feb949fc864c3396ef53f9fba331f65ba8
 2016-05-23 20:01:03 +00:00
Jason Monk
14abed66d7 Merge "Make battery labels translatable." into nyc-dev 2016-05-23 19:58:49 +00:00
Sid Soundararajan
0513125c92 Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev 2016-05-23 19:56:43 +00:00
Joe Onorato
97cdd11f2a Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev 
am: 4dbdd5d971

* commit '4dbdd5d97155364305abf7c010c165f1a6f79edb':
  Add data from /proc/pagetypeinfo to procstats.

Change-Id: I3c455fe69244927dc5aebdf5ddb7b0badf6aeee8
 2016-05-23 19:50:36 +00:00
TreeHugger Robot
4dbdd5d971 Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev 2016-05-23 19:46:49 +00:00
Selim Cinek
8a87d24e96 Merge "Fixed a flashing when the affordances were launched" into nyc-dev 
am: a56e732c01

* commit 'a56e732c01f10ebd27185a66ee4330f50c8cd57b':
  Fixed a flashing when the affordances were launched

Change-Id: I142fde45dd14de96f58289a8aed1113d3bf8578a
 2016-05-23 19:34:12 +00:00
Selim Cinek
c91da73326 Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev 
am: 7fc88ac214

* commit '7fc88ac2144a05f04a941d969f86f959a89916d8':
  Fixed a bug where the scrim could flash black when snoozing huns

Change-Id: I630704c54dbe15652172d7d723e211568e021082
 2016-05-23 19:34:08 +00:00
Selim Cinek
a56e732c01 Merge "Fixed a flashing when the affordances were launched" into nyc-dev 2016-05-23 19:26:23 +00:00
Selim Cinek
7fc88ac214 Merge "Fixed a bug where the scrim could flash black when snoozing huns" into nyc-dev 2016-05-23 19:25:56 +00:00
Selim Cinek
d4962867bd Merge "Fixed a crash with the autocancelling" into nyc-dev 
am: 4a4b76f6e8

* commit '4a4b76f6e842a4578dffedb2800d2b8eca813769':
  Fixed a crash with the autocancelling

Change-Id: I09e52b5ac392edaae7f42c7cb1903f60421b03bc
 2016-05-23 19:25:51 +00:00
TreeHugger Robot
4a4b76f6e8 Merge "Fixed a crash with the autocancelling" into nyc-dev 2016-05-23 19:21:57 +00:00
Chong Zhang
9ab291e20e Merge "Don\'t include removed window when counting interesting windows" into nyc-dev 
am: 18ef543102

* commit '18ef5431026365dd3b53a505fc57f538cf8dd48e':
  Don't include removed window when counting interesting windows

Change-Id: I3c2202e3928720161dbce8d1b4cfa0f16f83179f
 2016-05-23 19:08:00 +00:00
Chris Wren
4da0296e23 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev 
am: 28d9ef8112

* commit '28d9ef811291921ddb22e7b4b92e1222e673154e':
  Don't throw RemoteException from new NLS APIs

Change-Id: Ibafc3d9adeb046b2b43593285b6f605693b8682e
 2016-05-23 19:01:21 +00:00
Chong Zhang
18ef543102 Merge "Don't include removed window when counting interesting windows" into nyc-dev 2016-05-23 18:59:04 +00:00
TreeHugger Robot
28d9ef8112 Merge "Don't throw RemoteException from new NLS APIs" into nyc-dev 2016-05-23 18:54:20 +00:00
Victor Chang
a3e767a73d Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev 
am: 7c527bf76d

* commit '7c527bf76dcdcda414f10ed829999310f46161e7':
  Fix Certificate authority installed notification is gone when turning off and on the work mode.

Change-Id: If3e915aa66d29f70c217b3231937730c63f7e9eb
 2016-05-23 18:49:16 +00:00
Chong Zhang
e292eb3d4d Don't include removed window when counting interesting windows 
Also do not give input focus to window that's already marked for removal.
The input channel is already disposed and input manager will treat these
as null focus.

bug: 28797800

Change-Id: I3cb2d514a7286847f1ad6af3f629d04c303d3cbd
 2016-05-23 11:46:04 -07:00
Jason Monk
b8d6fcb552 Make battery labels translatable. 
Bug: 28829629
Change-Id: Id32587a4ad22aa79f7ec01f748466d6ff2394bcc
 2016-05-23 14:42:23 -04:00
Victor Chang
7c527bf76d Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev 2016-05-23 18:42:09 +00:00
Philip P. Moltmann
7ca655ea0a Merge "Correct height of add printer list separator" into nyc-dev 
am: 80c18bcc3a

* commit '80c18bcc3a52dee62eec4b95de1ebfbf3c7d397f':
  Correct height of add printer list separator

Change-Id: I3cfdf14bc4e72b727f6469f99f950794e667ce33
 2016-05-23 18:38:36 +00:00
Joe Onorato
c23befa183 Add data from /proc/pagetypeinfo to procstats. 
This data tells us the number of pages of each type that
are available by page size.  It is collected each time
the procstats snapshot is taken, and printed in the
checkin and verbose (dumpsys procstats -a) modes.

Change-Id: I14562eac15833617391c560638a9e7d239ef8db6
 2016-05-23 11:33:11 -07:00
Winson
60c32b1f15 Removing extra haptic feedback. 
am: 7660bca509

* commit '7660bca5099b1a568e025345f1ba0aa68793e15a':
  Removing extra haptic feedback.

Change-Id: I91237da897bfeeb89405e4e44828e1c312eee951
 2016-05-23 18:30:34 +00:00
Philip P. Moltmann
80c18bcc3a Merge "Correct height of add printer list separator" into nyc-dev 2016-05-23 18:27:14 +00:00