Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,750 Commits 3 Branches 0 Tags
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19
Commit Graph

164750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Lee
e69bdca44b DevicePolicy: Restore CA warning to K behaviour 
Some tests rely on this being dismissible. Additionally it turns out
some users don't like having a hulking great notification follow them
around everywhere.

Bug: 17985258
Change-Id: If05a07b9eaa402a48f9a14647effc1df32c796e1
 2014-10-20 20:55:40 +00:00
ztenghui
8c857eec74 am 12d808a2: am a724d1ab: am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit '12d808a24f4af9a127ae851edd06339b77020178':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:48:05 +00:00
ztenghui
12d808a24f am a724d1ab: am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit 'a724d1ab4083f08958bd88e76e15b7c0af337bfc':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:42:51 +00:00
ztenghui
a724d1ab40 am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev 
* commit '877ce2c42b5d423719246f5458cd66fa9fddb317':
  Make sure the bitmap from VD's cache is drawn using bi-linear filter.
 2014-10-20 20:35:58 +00:00
ztenghui
877ce2c42b Merge "Make sure the bitmap from VD's cache is drawn using bi-linear filter." into lmp-dev 2014-10-20 20:29:17 +00:00
John Spurlock
c8a01f353e am 3babc728: Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev 
* commit '3babc728e0910ac25744bdf3f923fdfdeeb689d1':
  Qualify private outer call in MediaProjectionManagerService.
 2014-10-20 20:20:25 +00:00
John Spurlock
3babc728e0 Merge "Qualify private outer call in MediaProjectionManagerService." into lmp-mr1-dev 2014-10-20 20:15:38 +00:00
RoboErik
7305b46527 am d00e68c3: am 26a43094: am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev 
* commit 'd00e68c3b6a4c727bd59a7e7c4524fb3fdd193f0':
  Set the metadata rating correctly in RCC
 2014-10-20 19:25:12 +00:00
RoboErik
d00e68c3b6 am 26a43094: am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev 
* commit '26a4309492f5af6828738a469ad8f18f42c44a61':
  Set the metadata rating correctly in RCC
 2014-10-20 19:20:32 +00:00
Adam Lesinski
aff7c2447d AAPT: Fix path for final generated resources on Windows 
Change-Id: Id11ac79b281b51747c73f90406ebd60023c54f92
 2014-10-20 12:15:25 -07:00
RoboErik
26a4309492 am 578fbe89: Merge "Set the metadata rating correctly in RCC" into lmp-dev 
* commit '578fbe898f1652b3166bd4e20647572dec9dfb14':
  Set the metadata rating correctly in RCC
 2014-10-20 19:13:20 +00:00
RoboErik
578fbe898f Merge "Set the metadata rating correctly in RCC" into lmp-dev 2014-10-20 19:07:52 +00:00
Alan Viverette
49870a1b64 am e28cd1a2: Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev 
* commit 'e28cd1a276d64d697da89cac4941baf79f380f6c':
  Only request layout when removeView() actually removes a view
 2014-10-20 19:06:49 +00:00
Alan Viverette
e28cd1a276 Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev 2014-10-20 19:00:36 +00:00
Santos Cordon
af1b296a41 Add hidden method to access a connection's service. 
This change exposes a method that is used by the actual
fix here: I4e4789c044d9e3614f42143cfa6053881a6d109b

Bug: 17962996
Change-Id: Iec3795ea372634120c71b0a80ee046e372569ecf
 2014-10-20 18:38:55 +00:00
Deepanshu Gupta
b69ec7708b Check Bridge init before disposing. 
In some cases ADT may dispose the Bridge even before init is called on
it. This caused an NPE. Fixed this by checking for the initialization
before disposing resources.

Bug: http://b.android.com/77726
Change-Id: I741d6ea3595a3b7cb816abd0417f23aecca6370e
 2014-10-20 11:12:53 -07:00
Libin.Tang@motorola.com
3a332602e3 am 846b71da: change setProvisionedValue/setProvisionedStringValue to return operation result. 
* commit '846b71daaf4468c01e5371ee64e19327f7c094f1':
  change setProvisionedValue/setProvisionedStringValue to return operation result.
 2014-10-20 17:43:08 +00:00
Hui Wang
d61cc80ef1 Add a constant for invalid profile id value 
Change-Id: I0cac2e38572e4b04081fd3347be05e57cc899008
 2014-10-20 10:41:09 -07:00
John Spurlock
9b84309bea Qualify private outer call in MediaProjectionManagerService. 
Change-Id: Ia4e09bdfe773a27107c0980a1aabf9b09e2b0a46
 2014-10-20 13:37:48 -04:00
Libin.Tang@motorola.com
846b71daaf change setProvisionedValue/setProvisionedStringValue to 
return operation result.

Change-Id: I24f127280d4692633ede7e17a63ababee1b6c71f
 2014-10-20 17:33:44 +00:00
Wink Saville
2af2d57d57 Radio Capability Support. 
New design of capability switch for L.
Add new RIL requests:
     RIL_REQUEST_GET_RADIO_CAPABILITY
     RIL_REQUEST_SET_RADIO_CAPABILITY
     RIL_UNSOL_RADIO_CAPABILITY

These commands allow the framework to communicate what the Radio
Capabilities for each logical modem has or should be using.

It can support 2/3/4G switch and has flexible architecture to support
future technology.

Change-Id: Iedf7f608d2ba3c06a883500f2d85abb98e69d9c1
 2014-10-20 10:31:05 -07:00
Dmitriy Ivanov
dbb45e03b8 am 604d3172: Merge "Link sigchain to main executable" into lmp-mr1-dev 
* commit '604d317205e030511c4f5529bd6e3d273eb1541f':
  Link sigchain to main executable
 2014-10-20 17:20:50 +00:00
Dmitriy Ivanov
604d317205 Merge "Link sigchain to main executable" into lmp-mr1-dev 2014-10-20 17:14:54 +00:00
Geoff Mendal
839c3b4041 am 85f079ee: (-s ours) am 2f831575: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '85f079ee58432ca20a55d8323724d0416cd2a594':
  Import translations. DO NOT MERGE
 2014-10-20 17:12:54 +00:00
Geoff Mendal
45cc590299 am d186d919: (-s ours) am 1d5af7b7: (-s ours) am 00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'd186d919d6bf0ee5ac02856db90e6d755ca625dd':
  Import translations. DO NOT MERGE
 2014-10-20 17:12:50 +00:00
Geoff Mendal
85f079ee58 am 2f831575: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '2f831575253e4f5a9e329e857aad2cd816f47524':
  Import translations. DO NOT MERGE
 2014-10-20 17:08:30 +00:00
Geoff Mendal
d186d919d6 am 1d5af7b7: (-s ours) am 00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '1d5af7b743fa32ca291d57a0b8b6998f7761c94d':
  Import translations. DO NOT MERGE
 2014-10-20 17:08:27 +00:00
smain@google.com
8aa74f88a0 am cc46a0e3: am dadc7d25: am 065b94c6: update workplace description in lollipop highlights bug: 18038081 
* commit 'cc46a0e3f276174cb68ddf4fdf4edc30f86235bd':
  update workplace description in lollipop highlights bug: 18038081
 2014-10-20 17:08:25 +00:00
Geoff Mendal
ccd9a96ff4 am d8439a8d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd8439a8d673181179a7cad6514da17846bf8e34b':
  Import translations. DO NOT MERGE
 2014-10-20 17:03:14 +00:00
smain@google.com
cc46a0e3f2 am dadc7d25: am 065b94c6: update workplace description in lollipop highlights bug: 18038081 
* commit 'dadc7d25ea997792c8348f22b18238ab19c73756':
  update workplace description in lollipop highlights bug: 18038081
 2014-10-20 17:03:09 +00:00
Geoff Mendal
2f83157525 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-20 17:02:55 +00:00
Geoff Mendal
1d5af7b743 am 00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '00831836cdeeb4a61ba10c724c3ca33280937b62':
  Import translations. DO NOT MERGE
 2014-10-20 17:02:10 +00:00
Geoff Mendal
9109f8e95d Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-20 16:58:58 +00:00
Geoff Mendal
d8439a8d67 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-20 16:57:38 +00:00
smain@google.com
dadc7d25ea am 065b94c6: update workplace description in lollipop highlights bug: 18038081 
* commit '065b94c6a634e7a765f2674cff696a75e76f6425':
  update workplace description in lollipop highlights bug: 18038081
 2014-10-20 16:57:22 +00:00
Geoff Mendal
00831836cd Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-20 16:56:51 +00:00
smain@google.com
065b94c6a6 update workplace description in lollipop highlights 
bug: 18038081

Change-Id: I612fc52392bc0fb71cc2e7b4c0da1fcaae6ac6fe
 2014-10-20 09:48:33 -07:00
RoboErik
38696ba77d Set the metadata rating correctly in RCC 
We weren't setting the ratings in the new MediaMetadata from RCC.
This adds some code to set them correctly.

bug:18051829
Change-Id: I358eeb2b25b3fb9bd9a5d207eb3314bb2cdff25e
 2014-10-20 09:48:13 -07:00
Geoff Mendal
330a74b16e Import translations. DO NOT MERGE 
Change-Id: Id9f97226c8140113ba6f35b67b9a7855d591ff5e
Auto-generated-cl: translation import
 2014-10-20 09:44:01 -07:00
Geoff Mendal
f0c7b8dc7a Import translations. DO NOT MERGE 
Change-Id: I53e488509722672fcc9635d67189e5126b49ca1f
Auto-generated-cl: translation import
 2014-10-20 09:40:04 -07:00
Geoff Mendal
bd7e93d401 Import translations. DO NOT MERGE 
Change-Id: I33de2b927652754e951be07a19d6e27f7350de47
Auto-generated-cl: translation import
 2014-10-20 09:38:16 -07:00
Geoff Mendal
c09f8b7a08 Import translations. DO NOT MERGE 
Change-Id: I3dd702947875349b8ca04edb813687588e4db689
Auto-generated-cl: translation import
 2014-10-20 09:34:39 -07:00
Adrian Roos
0f36afb83b am 0b3036a5: Merge "Fix issues with TrustDrawable" into lmp-mr1-dev 
* commit '0b3036a5a06e0c42e9d099be3a7108ccc5a69031':
  Fix issues with TrustDrawable
 2014-10-20 15:25:13 +00:00
Adrian Roos
0c458aa515 am 7356a713: Merge "Keyguard: Show IME automatically on tablets" into lmp-mr1-dev 
* commit '7356a7137306a32e690376a46ecf9a5f5443dba0':
  Keyguard: Show IME automatically on tablets
 2014-10-20 15:20:59 +00:00
Adrian Roos
0b3036a5a0 Merge "Fix issues with TrustDrawable" into lmp-mr1-dev 2014-10-20 15:19:14 +00:00
Adrian Roos
7356a71373 Merge "Keyguard: Show IME automatically on tablets" into lmp-mr1-dev 2014-10-20 15:17:00 +00:00
Geoff Mendal
3c88ca1670 am c79aee58: (-s ours) am fdd10578: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'c79aee58401c6173486fede6cf1356fe7cb6791c':
  Import translations. DO NOT MERGE
 2014-10-20 14:23:03 +00:00
Geoff Mendal
2c560438a3 am 1d5ac8dc: (-s ours) am 97f548ec: (-s ours) am bae5d85a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '1d5ac8dcee3b36a00d44858016f5192115f0b127':
  Import translations. DO NOT MERGE
 2014-10-20 14:22:58 +00:00
Geoff Mendal
c79aee5840 am fdd10578: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'fdd10578ae107a326246612d8ddf93157bcfbc8e':
  Import translations. DO NOT MERGE
 2014-10-20 14:17:17 +00:00
Geoff Mendal
1d5ac8dcee am 97f548ec: (-s ours) am bae5d85a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '97f548ec76aaf26b92fa553cccfd73f66ddc9b95':
  Import translations. DO NOT MERGE
 2014-10-20 14:17:13 +00:00