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

66691 Commits

Author SHA1 Message Date
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
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
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
Seigo Nonaka
0696b9ae90 Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2 am: 18bf0e2ad2 
am: 461e71472d

* commit '461e71472df1942936c27fb65f46b72c3eb4ab1b':
  Clear locales without changing layout direction.

Change-Id: I0db0a2e72765632803a17dce56857207ffc146e9
 2016-05-20 20:08:39 +00:00
Roozbeh Pournader
461e71472d Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2 
am: 18bf0e2ad2

* commit '18bf0e2ad22a28060e9cbd1516b1c36236c5b557':
  Clear locales without changing layout direction.

Change-Id: Ia3925ac1adbf3e5cdaa45c1d88f9fc50483765cb
 2016-05-20 20:00:39 +00:00
Seigo Nonaka
18bf0e2ad2 Merge "Clear locales without changing layout direction." into nyc-dev 
am: 6686711ba2

* commit '6686711ba289740a20dc15133aed4a2b5bac5d44':
  Clear locales without changing layout direction.

Change-Id: Ifa6124e9b772b54355b696aa4df1ca94950c64c5
 2016-05-20 19:52:55 +00:00
Seigo Nonaka
5ac2c3b4a0 Merge "Clear locales without changing layout direction." into nyc-dev 
am: 6686711ba2

* commit '6686711ba289740a20dc15133aed4a2b5bac5d44':
  Clear locales without changing layout direction.

Change-Id: I5c7714d3ef54fc7caf6580837d48a1b79e56a892
 2016-05-20 19:52:54 +00:00
Roozbeh Pournader
6686711ba2 Merge "Clear locales without changing layout direction." into nyc-dev 2016-05-20 19:42:31 +00:00
Siyamed Sinir
0923b063c4 Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c am: 8ae06f6f3a 
am: 68d3077e9a

* commit '68d3077e9a11c96d118834563fa283b3ead4f1a7':
  setTransformationMethod should reset mTextDir

Change-Id: I46a1f5e356992bd08ba440fce0e15b952541d547
 2016-05-20 18:07:06 +00:00
Siyamed Sinir
68d3077e9a Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c 
am: 8ae06f6f3a

* commit '8ae06f6f3a4fa787ddab9859bc680e63b38686aa':
  setTransformationMethod should reset mTextDir

Change-Id: Ib0c29292f24c049acb3c61baf68ae3df970610c1
 2016-05-20 18:02:39 +00:00
Seigo Nonaka
bd5cac67b8 Clear locales without changing layout direction. 
Calling Configuration.setLocales with emtpy LocaleList may change the
layout direction to LTR. To clear the locales in Configuration without
layout direction change, introduce hidden API to Configuration.

Bug: 28695661
Change-Id: I47c339dffb83099bd329ddb60237dab27b05f593
 2016-05-20 17:59:35 +00:00
Siyamed Sinir
8ae06f6f3a Merge "setTransformationMethod should reset mTextDir" into nyc-dev 
am: df9dee869c

* commit 'df9dee869c9efa18619b28691c88415b4f115df7':
  setTransformationMethod should reset mTextDir

Change-Id: I47699dc6e8c8fdddd91db2c4590a5244403c5f5c
 2016-05-20 17:53:50 +00:00
Siyamed Sinir
214ebfb532 Merge "setTransformationMethod should reset mTextDir" into nyc-dev 
am: df9dee869c

* commit 'df9dee869c9efa18619b28691c88415b4f115df7':
  setTransformationMethod should reset mTextDir

Change-Id: I17d4dc951f840dcfc1e76ed6e9d6b02150495bf9
 2016-05-20 17:53:44 +00:00
Siyamed Sinir
df9dee869c Merge "setTransformationMethod should reset mTextDir" into nyc-dev 2016-05-20 17:46:27 +00:00
Adam Lesinski
6028e28986 Merge "Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 am: 7dd96663a0" into nyc-mr1-dev-plus-aosp 
am: 768542e38d

* commit '768542e38d356bd18cb567dacc89c504d128ccd4':
  Fix parsing of kernel wakelocks

Change-Id: Ic5b48697830e96528cd87a579f0ee8a5ab665bf9
 2016-05-20 17:43:40 +00:00
Adam Lesinski
fea0c3af7a Merge "Fix parsing of kernel wakelocks" into nyc-dev 
am: 6f0d399214

* commit '6f0d3992149aa782450667ed750fe0c3cf8ee334':
  Fix parsing of kernel wakelocks

Change-Id: Ibc60849809b5553e820833437a9d2d47d065a38e
 2016-05-20 17:32:42 +00:00
Adam Lesinski
acb5ac77a3 Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 
am: 7dd96663a0

* commit '7dd96663a0c728b4913ed4146cc442336833a1ca':
  Fix parsing of kernel wakelocks

Change-Id: I312c22fdbee545a2f7991c320ee4d5eea73decba
 2016-05-20 17:32:04 +00:00
Christopher Tate
39b1dd9ec8 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 am: 36b03ec9f0 
am: 1500a27af2

* commit '1500a27af2e4daede64b938cf4207748c283654a':
  Back up / restore the 'mono audio' setting

Change-Id: I6ba6bec20b5be767cd8b97b4ac1fb022ff9be0a5
 2016-05-20 17:30:19 +00:00
Adam Lesinski
7dd96663a0 Merge "Fix parsing of kernel wakelocks" into nyc-dev 
am: 6f0d399214

* commit '6f0d3992149aa782450667ed750fe0c3cf8ee334':
  Fix parsing of kernel wakelocks

Change-Id: I8627d87ce84e9c03407a8e5be353aa44635a7712
 2016-05-20 17:27:23 +00:00
Adam Lesinski
6f0d399214 Merge "Fix parsing of kernel wakelocks" into nyc-dev 2016-05-20 17:23:08 +00:00
Chris Tate
1500a27af2 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 
am: 36b03ec9f0

* commit '36b03ec9f0cd6466f2bd9517a72438e446033685':
  Back up / restore the 'mono audio' setting

Change-Id: I0947760de027c0dfa1fd5f66ea7adfcae9d965a0
 2016-05-20 17:16:25 +00:00
Christopher Tate
d33151bf4f Merge "Back up / restore the \'mono audio\' setting" into nyc-dev 
am: a3aaa5ee25

* commit 'a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14':
  Back up / restore the 'mono audio' setting

Change-Id: Ieb242d2d382218b6090acf0e72c33c865fb0994b
 2016-05-20 17:11:10 +00:00
Christopher Tate
36b03ec9f0 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev 
am: a3aaa5ee25

* commit 'a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14':
  Back up / restore the 'mono audio' setting

Change-Id: Ie20918c1a8306342de7a5e2201d3e55fff39500c
 2016-05-20 17:11:07 +00:00
Chris Tate
a3aaa5ee25 Merge "Back up / restore the 'mono audio' setting" into nyc-dev 2016-05-20 17:05:39 +00:00
Neil Fuller
7efd7d6ef2 Merge "Add support for ICU data pinning in the Zygote" into nyc-dev 
am: 761f70d5a6

* commit '761f70d5a6b926780db3bba95ee1e01b4d8d95be':
  Add support for ICU data pinning in the Zygote

Change-Id: If693e8cbb737186fdf0a3169d024bef08c8ceb6a
 2016-05-20 13:00:29 +00:00
Neil Fuller
761f70d5a6 Merge "Add support for ICU data pinning in the Zygote" into nyc-dev 2016-05-20 12:53:48 +00:00
Siyamed Sinir
d55be2b9d5 setTransformationMethod should reset mTextDir 
When transformation method is set via API, text direction heuristics has
to be reset since for PasswordTransformationMethod it is set to LTR. Not
resetting it causes inconsistencies with the remaining of the TextView.

Bug: 28562779
Change-Id: I225e35e39bde60d4296852ff17b107d5b7b99f8a
 2016-05-19 18:30:38 -07:00
Ta-wei Yen
427bfc0842 Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913 am: 93ad8c6b2f" into nyc-mr1-dev-plus-aosp 
am: 48fcac0445

* commit '48fcac0445741a9c4ba3bee60a5c41758c9b4068':
  Hide VoicemailContract.setQuota()

Change-Id: I236f788a0ee0e1bca73163108f055d15c7a33050
 2016-05-20 01:23:22 +00:00
Ta-wei Yen
1d7c21fdb3 Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f am: 621b68a213 
am: f652b1ec42

* commit 'f652b1ec426b0d8141cd5860a8ddd0985cb1c08b':
  Rename visual voicemail sync intent value

Change-Id: I3769f7a4958eae52047dc276b96939a73418d1ac
 2016-05-20 01:19:35 +00:00
Ta-wei Yen
df858672ba Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913 
am: 93ad8c6b2f

* commit '93ad8c6b2f9b6610989ef8d37e62f7b66e6f6c11':
  Hide VoicemailContract.setQuota()

Change-Id: Ibce8e2d08074ea44e22a0b3a9fc596ebdb78740e
 2016-05-20 01:14:01 +00:00
Ta-wei Yen
f652b1ec42 Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f 
am: 621b68a213

* commit '621b68a2136b644734292655228503c42a541576':
  Rename visual voicemail sync intent value

Change-Id: Ia517f7c596e8d1d1dc055ea081950328faf4f34f
 2016-05-20 01:11:34 +00:00
Ta-wei Yen
ba9b910bbc Merge "Hide VoicemailContract.setQuota()" into nyc-dev 
am: 4f2a1d0913

* commit '4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
  Hide VoicemailContract.setQuota()

Change-Id: I11017309443435f9fe840c72deada0c7984f5ce9
 2016-05-20 01:07:56 +00:00
Ta-wei Yen
93ad8c6b2f Merge "Hide VoicemailContract.setQuota()" into nyc-dev 
am: 4f2a1d0913

* commit '4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
  Hide VoicemailContract.setQuota()

Change-Id: Ifc1365650a981130a376ef253e96331595475510
 2016-05-20 01:07:52 +00:00
Ta-wei Yen
7220c75f65 Merge "Rename visual voicemail sync intent value" into nyc-dev 
am: 0f712b164f

* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
  Rename visual voicemail sync intent value

Change-Id: I677dcd6e8261dfdbf4ab203ef1232f9f599a0687
 2016-05-20 01:06:04 +00:00
Ta-wei Yen
621b68a213 Merge "Rename visual voicemail sync intent value" into nyc-dev 
am: 0f712b164f

* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
  Rename visual voicemail sync intent value

Change-Id: I3c842deef20bcc0258affa2ca7d2241502ec49f6
 2016-05-20 01:06:03 +00:00
Ta-wei Yen
4f2a1d0913 Merge "Hide VoicemailContract.setQuota()" into nyc-dev 2016-05-20 01:00:30 +00:00
Ta-wei Yen
0f712b164f Merge "Rename visual voicemail sync intent value" into nyc-dev 2016-05-20 01:00:04 +00:00