Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
263,365 Commits 3 Branches 0 Tags
ad791cf9564a9c874006a42c217be8be7baca461
Commit Graph

66727 Commits

Author SHA1 Message Date
Pavlin Radoslavov
ad791cf956 Reduced the impact of "synchronized" statements am: eb50a39e98 am: 13b1a15db0 
am: 813d5bd9b3

* commit '813d5bd9b36642a06618995fa3d116b9c79b0d6f':
  Reduced the impact of "synchronized" statements

Change-Id: Ib2fa9a53a234418308b07f61d7f3d1eaa61898f6
 2016-05-24 02:41:51 +00:00
Pavlin Radoslavov
813d5bd9b3 Reduced the impact of "synchronized" statements am: eb50a39e98 
am: 13b1a15db0

* commit '13b1a15db07b2187b8a134f54e574e2c6a76dadc':
  Reduced the impact of "synchronized" statements

Change-Id: I84d731281a7424a6d9fe4ae633f47a97a0446aa7
 2016-05-24 02:38:29 +00:00
Pavlin Radoslavov
13b1a15db0 Reduced the impact of "synchronized" statements 
am: eb50a39e98

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

Change-Id: I60a4b0e656b283f83c49c3c0211943b4854867e0
 2016-05-24 02:34:28 +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
Dianne Hackborn
4debcd04a1 Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad am: 74ebf3ec67 
am: c21fa8c3f6

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

Change-Id: Ie07d802b416a0b6a04777dc762d5968b93fa1a2c
 2016-05-24 00:39:39 +00:00
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
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
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
Dianne Hackborn
9c252700f6 Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev 2016-05-24 00:18:39 +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
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
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
d15cc7a83e Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 2016-05-23 23:04:36 +00:00
Joe Onorato
8472eee461 Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971 am: c3db3e217f 
am: 4f5febce80

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

Change-Id: I9e404c94c56fcb0a62a141b353dd76932947ca76
 2016-05-23 21:54:59 +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
Adrian Roos
f5faf9db14 Deprecate unnecessairy Notification.Style constructors 
Change-Id: I7a15eaaac4f756d137483aec5f389951c5a7eecb
Fixes: 28775574
 2016-05-23 14:00:07 -07:00
Joe Onorato
4f5febce80 Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev am: 4dbdd5d971 
am: c3db3e217f

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

Change-Id: Iddfcdfeb0ad1194488ce504d420696a83d20a786
 2016-05-23 19:54:10 +00:00
Joe Onorato
c3db3e217f Merge "Add data from /proc/pagetypeinfo to procstats." into nyc-dev 
am: 4dbdd5d971

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

Change-Id: Ic86eb0ad4278dc2d0b7f93148bab00a1f707dc16
 2016-05-23 19:50:45 +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
Chris Wren
d44f936791 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 am: ec2e36a485 
am: 99eed4b5d6

* commit '99eed4b5d6291fe8714ed55dbf4598db6fe29711':
  Don't throw RemoteException from new NLS APIs

Change-Id: If12e8f4b7194afbe4ec7f7d246d79ec1bb465cb2
 2016-05-23 19:11:13 +00:00
Chris Wren
99eed4b5d6 Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 
am: ec2e36a485

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

Change-Id: If4175e64a71b2b02306f9eb579f9755492ea6dfd
 2016-05-23 19:07:27 +00:00
Chris Wren
ec2e36a485 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: I8a89c5e4b800baf8c810eb24b0b5435fa63b1378
 2016-05-23 19:01:27 +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
TreeHugger Robot
28d9ef8112 Merge "Don't throw RemoteException from new NLS APIs" into nyc-dev 2016-05-23 18:54:20 +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
Chris Wren
601b4eef88 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619 am: 688ebc6f75 
am: f9f6d64ed8

* commit 'f9f6d64ed8406dc6417cc88c9e49d68d45c3773a':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I25e158bfe98d4bca60a7e460b6c6bd6784caade0
 2016-05-23 17:58:04 +00:00
Chris Wren
f9f6d64ed8 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619 
am: 688ebc6f75

* commit '688ebc6f753ad574e1e2ca3f67acf592abe53d5c':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I8492b9148b66b9aef69362b10de10ef8f991ecc7
 2016-05-23 17:53:25 +00:00
Chris Wren
688ebc6f75 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev 
am: 0a9ccf2619

* commit '0a9ccf26192bc5a6fd74afb7afd4834b08230299':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I0e4bd4aaf4c6513c289ca948f63c5bc5c3c7ed02
 2016-05-23 17:47:29 +00:00
Chris Wren
66bd6bca16 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev 
am: 0a9ccf2619

* commit '0a9ccf26192bc5a6fd74afb7afd4834b08230299':
  Never fetch notification badges for USER_SYSTEM

Change-Id: Ic6530a6b92c26d68a25ab15d24779b5f3f10f35a
 2016-05-23 17:47:29 +00:00
Chris Wren
0a9ccf2619 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev 2016-05-23 17:44:16 +00:00
Victor Chang
a0e421d4e9 Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b am: 1e93177121 
am: 8dda22449b

* commit '8dda22449b47ff3f9fa22c8ee790baaa502ef610':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: Ibb8312c7e8b5920ecd4790882ba63c132b913a47
 2016-05-23 12:09:32 +00:00
Victor Chang
8dda22449b Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b 
am: 1e93177121

* commit '1e93177121848f337c512b7ce0d06265abb02356':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: If568c19a9fb67eb847b776981a42049cececfe45
 2016-05-23 12:03:40 +00:00
Victor Chang
8806a4bdc8 Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev 
am: d86ac8116b

* commit 'd86ac8116bfc64c61d8124ff8d3e92be5e55cd3e':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: I07d18fd5c472f1ab3f3ad4c37583e9092f4431b4
 2016-05-23 11:59:02 +00:00
Victor Chang
1e93177121 Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev 
am: d86ac8116b

* commit 'd86ac8116bfc64c61d8124ff8d3e92be5e55cd3e':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: I3fe13c51d5d33f5689f0b4130a33cf3a2777e186
 2016-05-23 11:58:41 +00:00
Victor Chang
d86ac8116b Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev 2016-05-23 11:51:56 +00:00
Chad Brubaker
532bbd2438 Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 am: 76d3d8590d 
am: be04f7247a

* commit 'be04f7247a5835bcba2f598e9d47e0a07d08af3d':
  Use an attribute for the network security config resource

Change-Id: I5c2213114bf26a4506a64c5a5a8a2e592610783d
 2016-05-23 02:44:34 +00:00
Chad Brubaker
be04f7247a Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 
am: 76d3d8590d

* commit '76d3d8590d1fb9a9c341159fbc06914ef19bdb8d':
  Use an attribute for the network security config resource

Change-Id: I15da47a2cd78dc37019bd20847d13248612c77f5
 2016-05-23 02:38:19 +00:00
Chad Brubaker
76d3d8590d Merge "Use an attribute for the network security config resource" into nyc-dev 
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I2236b69a2af2258e7600a4833fe7be95f64e6260
 2016-05-23 02:32:19 +00:00
Chad Brubaker
c6a49bb008 Merge "Use an attribute for the network security config resource" into nyc-dev 
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I470b8e991d590135223066d18b49ff123e0b1f6e
 2016-05-23 02:32:19 +00:00
TreeHugger Robot
6812bdf387 Merge "Use an attribute for the network security config resource" into nyc-dev 2016-05-23 02:23:26 +00:00
Robert Carr
a7dfbc9437 Merge "Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 am: fe25025c5c" into nyc-mr1-dev-plus-aosp 
am: abb81c5972

* commit 'abb81c59729ad97e1207449c84f8e96986ea2a6a':
  Correctly clear resizing drawable when nulling background.

Change-Id: I50ee5eda0a88af238719a83a3e39ed81da0f2dbe
 2016-05-20 23:13:36 +00:00
Robert Carr
ac0ed76278 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 
am: fe25025c5c

* commit 'fe25025c5c9e551599a8ce5228cc5d4b41385f3b':
  Correctly clear resizing drawable when nulling background.

Change-Id: Ib93cee44edc0317a806d90ea2b2a44d293af1c1f
 2016-05-20 23:08:20 +00:00
Robert Carr
89770ebf62 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev 
am: a3ec065a43

* commit 'a3ec065a43069a19dc42f023a40d54a3178f1b44':
  Correctly clear resizing drawable when nulling background.

Change-Id: I9cbb109bbd7891c30711a68bf88d8b2c4332baa3
 2016-05-20 23:01:03 +00:00
Robert Carr
fe25025c5c Merge "Correctly clear resizing drawable when nulling background." into nyc-dev 
am: a3ec065a43

* commit 'a3ec065a43069a19dc42f023a40d54a3178f1b44':
  Correctly clear resizing drawable when nulling background.

Change-Id: Ifb02cc95efc8b164ab8ee63fa9d83bae3172da23
 2016-05-20 23:01:02 +00:00
TreeHugger Robot
a3ec065a43 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev 2016-05-20 22:56:47 +00:00
Meng Wang
faf4843b99 Merge "Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev am: ac517216c5" into nyc-mr1-dev-plus-aosp 
am: f71eae2644

* commit 'f71eae2644ce2f8c3b1227df91248637f0231257':
  Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager

Change-Id: Ie2ffd247f9803b822c9cdd4080edfcfe6a18e9b9
 2016-05-20 22:33:22 +00:00
Meng Wang
fe9ed66227 Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev 
am: ac517216c5

* commit 'ac517216c50075baf3f93ae06ebec3dcb68ad9a9':
  Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager

Change-Id: Ice91655cf111964ec20f961b2555da3cc4b9325c
 2016-05-20 22:21:26 +00:00
Meng Wang
64997623bf Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager 
Also:
   Add RIL constants RIL_REQUEST_SET_ALLOWED_CARRIERS, RIL_REQUEST_GET_ALLOWED_CARRIERS

Bug: 28564314
Change-Id: Iaf6c40de633e767309c4088249a5c13cb0988c5c
 2016-05-20 13:18:41 -07:00