Commit Graph

177037 Commits

Author SHA1 Message Date
John Spurlock
edad58bc61 am de9af5cd: am 17ca1aaf: Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev
* commit 'de9af5cdc0a8ce55657e82fa2a71faa9d6321cb1':
  Zen: Fix selection logic for "Indefinitely".
2014-12-26 20:30:21 +00:00
Jean-Michel Trivi
6fa5d8dab0 am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1-dev
* commit '98ba8409876087f32114d889435b7f1bd7a73ffb':
  AudioRecord: filter attributes
2014-12-26 20:30:04 +00:00
Elliott Hughes
38cba11ba9 am f9f41951: am ee435b16: Merge "telephony: Update comments for preferred network mode"
* commit 'f9f41951701f5e47b454b7c3f4e7d4654a9c4a3e':
  telephony: Update comments for preferred network mode
2014-12-26 18:59:22 +00:00
Elliott Hughes
f9f4195170 am ee435b16: Merge "telephony: Update comments for preferred network mode"
* commit 'ee435b16d89ee9cb65eead9ac7507693342c15b3':
  telephony: Update comments for preferred network mode
2014-12-26 18:53:55 +00:00
Elliott Hughes
ee435b16d8 Merge "telephony: Update comments for preferred network mode" 2014-12-26 18:48:57 +00:00
Sungmin Choi
e099ab18e6 telephony: Update comments for preferred network mode
Change-Id: I4718674ff73116cc6bbec4540c3450ed14663c0d
2014-12-25 07:39:37 +00:00
Seonggoo Kang
72745fffe8 Prevent duplicated registration of OnComputeInternalInsetsListener
OnComputeInternalInsetsListener is added when initViews is called,
and initViews is called by onCreate and onConfigurationChanged.
But it is removed only by onDestroy.
Therefore listeners are accumulated and it results performance issue.
So before adding, remove mInsetListener that was previously added.

Change-Id: I494d3f1875613d73d3f9b8e2af286b5800f03196
2014-12-24 14:05:17 +09:00
John Spurlock
db416907b8 am af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev
* commit 'af84e073bce12c6ae0c737339804e96314bb663d':
  Audio Policy: Clear calling identity for all paths setting ringer mode.
2014-12-24 01:21:22 +00:00
John Spurlock
af84e073bc Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev 2014-12-24 01:16:14 +00:00
Michael Wright
446e019a06 Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
This prevents our lint tooling from complaining that we're passing
invalid values when trying to get the MediaProjectionManager.

Bug: 18830590
Change-Id: I34633248e895b0ac7f5083e18a7d2385ca6f8adb
2014-12-23 17:01:49 -08:00
Rachad
6564f5be74 MediaCodec: Added E-AC3 mime type (@hide).
Bug: 17883772
Change-Id: I48b2ab64812d860bb1a01d0a14e10690b86c4519
2014-12-23 16:12:44 -08:00
Marvin Paul
8fc5072524 Don't backup ringtone on non-telephony devices.
Restoring a device that supports telephony using the backup set of
a non-telephony device would cause the ringtone to be set to "None"
instead of the default value. This was due to the fact that on
non-telephony devices, the ringtone value was being backed up as
"_silent" instead of null.

Bug: 18777629

Change-Id: Idece1f874438a895169dbba7df1d716adea6660e
2014-12-23 14:58:17 -08:00
John Spurlock
af88a19165 Audio Policy: Clear calling identity for all paths setting ringer mode.
For proper appops bookkeeping and zen setting changes.

Bug: 18832923
Change-Id: Ic029d3226458ca1a9229a0bc5726bedd5e117ad7
2014-12-23 16:14:44 -05:00
Deepanshu Gupta
0ff4568ca0 Make Preference-cookie map non static.
Moved the map from Preference to View Cookie to BridgeContext. This
means the map need not be static anymore.

NO_SQ: Depends on unsubmitted changes.
Change-Id: I662513def17bd6ec3a2646c3bec9bf4f9f89fc15
2014-12-23 12:04:30 -08:00
Deepanshu Gupta
dfeffd4c0a Fix default initial value for preferences
NO_SQ: Depends on unsubmitted changes.
Change-Id: I061cf71f6167d382e9ef060abeb4d5cff83c4104
2014-12-23 12:04:30 -08:00
Deepanshu Gupta
10bb1371dc Add preferences rendering.
NO_SQ: Depends on updating layoutlib-api-prebuilt.jar
Change-Id: Iae93ab74c478e6f2158e1528467bec9ee2d7ee9b
2014-12-23 12:04:30 -08:00
Nick Kralevich
01d25862ef am 8454f2d4: am 5e1e38cc: Merge "Mods to the SELinuxMMAC engine code."
* commit '8454f2d48517d79268688b2262b17ff0cab39622':
  Mods to the SELinuxMMAC engine code.
2014-12-23 19:52:12 +00:00
Nick Kralevich
8454f2d485 am 5e1e38cc: Merge "Mods to the SELinuxMMAC engine code."
* commit '5e1e38ccdd3da34f65a642dc25b5b2b5cf2b6059':
  Mods to the SELinuxMMAC engine code.
2014-12-23 19:46:44 +00:00
Nick Kralevich
5e1e38ccdd Merge "Mods to the SELinuxMMAC engine code." 2014-12-23 19:42:06 +00:00
Robert Craig
2e1f052f45 Mods to the SELinuxMMAC engine code.
* We now require that all certs used to sign the apk and all
  certs stored with policy be tested for set equality. Prior
  efforts required that the cert included with policy only
  needed to match one of the certs included with an apk.

* Allowed a new tag to be included with policy describing the
  signatures. <cert signature=""/> is now allowed as a child
  element of the <signer> tag describing multiple certs. The
  old way of describing signatures attached as attributes to
  the root signer tag is still supported. The engine now treats
  it the same as if they used the new layout with the outer
  signature as the first signature value.

* Moved the class which holds all policy from an inner static
  to a builder pattern governed by the Policy.PolicyBuilder
  class. This will help provide more clarity and allow for
  easier enforcement of certain invariants as the policy
  representation is being built.

* Loads of new comments.

Change-Id: I38eb00ed8962fdef71bc9f2e7370cb910cadeff4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-12-23 18:30:31 +00:00
Shishir Agrawal
7287ed3d4b Data quick settings - Usage shown should take into account merged IDs.
The System Settings data usage graph takes into account merged Ids
(b/18012787), but the quick settings usage graph does not.

Bug: 18805245
Change-Id: I3146052606e691129a3aa5cc509cf632fda9d6b2
2014-12-23 09:54:48 -08:00
Baligh Uddin
bedfb2faec am 45c6ae56: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '45c6ae56d969709e0969514fa219375561c2df38':
  Import translations. DO NOT MERGE
2014-12-23 15:59:36 +00:00
Baligh Uddin
378939f058 am 4acca673: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '4acca673904d3f99a3686a9ad92f471e97e67959':
  Import translations. DO NOT MERGE
2014-12-23 15:59:31 +00:00
Baligh Uddin
45c6ae56d9 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 15:53:44 +00:00
Baligh Uddin
155521586c Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-12-23 15:53:38 +00:00
Baligh Uddin
c5d0323c12 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-23 15:53:32 +00:00
Baligh Uddin
4acca67390 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 15:52:54 +00:00
Baligh Uddin
b0e2d4c7f1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-23 15:52:49 +00:00
riddle_hsu
9ac9609f4d [ActivityManager] Prevent application holding AMS lock
Symptom:
Watchdog timeout.

Reproduce code:
String action = "lets.deadlock";
Uri baseUri = Uri.parse("content://i.am.bad");
Uri uri = ContentUris.withAppendedId(baseUri, 1);
Intent intent = new Intent(action, uri);
sendStickyBroadcast(intent);

IntentFilter filter = new IntentFilter(action);
filter.addDataScheme(baseUri.getScheme());
filter.addDataAuthority(baseUri.getAuthority(), null);
filter.addDataPath(uri.getPath(), 0);
registerReceiver(null, filter);

In target provider's getType:
Invoke AMS function will result deadlock.
Or sleep a long time will also trigger watchdog timeout.

Root Cause:
If broadcast is sticky with content scheme intent.
Register receiver will trigger access provider when
matching intent with IntentFilter, and it executes
in ActivityManagerService's lock.

Solution:
Obtain necessary data to local to split lock block.

Change-Id: I0fb94472cdc478997e40ba2a60a988c5f53badb2
2014-12-23 22:52:34 +08:00
Narayan Kamath
6d2d7f19a0 am 4dcc8d28: am d7771768: Merge "Build against libphonenumber-platform."
* commit '4dcc8d28d7933a4a08d2330f78f3b4486d2ef264':
  Build against libphonenumber-platform.
2014-12-23 13:47:50 +00:00
Narayan Kamath
4dcc8d28d7 am d7771768: Merge "Build against libphonenumber-platform."
* commit 'd777176872792ed2a17f46acbd2f8ebc64ac1995':
  Build against libphonenumber-platform.
2014-12-23 13:41:17 +00:00
Narayan Kamath
d777176872 Merge "Build against libphonenumber-platform." 2014-12-23 13:33:45 +00:00
Robin Lee
c9db16c591 am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev
* commit 'b4b14e391dbcde537350ccf649b3603cafba1e6c':
  Revert "DevicePolicy: Don't warn about managed profile CAs"
2014-12-23 13:29:05 +00:00
Robin Lee
b4b14e391d Merge "Revert "DevicePolicy: Don't warn about managed profile CAs"" into lmp-mr1-dev 2014-12-23 12:30:28 +00:00
Baligh Uddin
8dbf4f60e6 Import translations. DO NOT MERGE
Change-Id: Ia6fc4bb7529db266834f9de0e809c77be53fa38b
Auto-generated-cl: translation import
2014-12-23 00:37:22 -08:00
Baligh Uddin
3fa832bbfa Import translations. DO NOT MERGE
Change-Id: I2096264002a0f4dad73672f5834327f151e95788
Auto-generated-cl: translation import
2014-12-23 00:28:11 -08:00
Baligh Uddin
6bae3c9915 Import translations. DO NOT MERGE
Change-Id: I0ae3a4265cb2b5b5a393cecd5f992736302f38b8
Auto-generated-cl: translation import
2014-12-22 21:51:09 -08:00
Baligh Uddin
192c568072 Import translations. DO NOT MERGE
Change-Id: I8e2bfc9d5db55c0a7aa2c0cc7d0318ed5df921c0
Auto-generated-cl: translation import
2014-12-22 21:46:27 -08:00
Baligh Uddin
1cbf184edd Import translations. DO NOT MERGE
Change-Id: Ic2b81358285cfa793cf31ddc621e86fadb7d218f
Auto-generated-cl: translation import
2014-12-22 20:56:36 -08:00
Baligh Uddin
cecabf48ae am 83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '83a590b14ca70da7b6061529a521212572d732b3':
  Import translations. DO NOT MERGE
2014-12-23 04:50:07 +00:00
Baligh Uddin
83a590b14c Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 04:44:58 +00:00
Baligh Uddin
f17490f5c2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-23 04:44:53 +00:00
Baligh Uddin
0b85506360 Import translations. DO NOT MERGE
Change-Id: Ie975c5e8d1edb7afc679ce1d27bb7e09b81df571
Auto-generated-cl: translation import
2014-12-22 20:26:50 -08:00
Baligh Uddin
4136b4f7fe Import translations. DO NOT MERGE
Change-Id: Ib629c0bca4f92a0c81bf5af904773df1b1f8549e
Auto-generated-cl: translation import
2014-12-22 20:23:07 -08:00
Pavel Zhamaitsiak
48fd1688a2 am b45075a7: Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev
* commit 'b45075a7cb508e63ff2d662affbc970202249ac2':
  Add configuration indicating whether TTY over VoLTE is supported.
2014-12-23 03:44:34 +00:00
Andreas Gampe
83cfb97323 am 5470c169: am 2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime"
* commit '5470c1699121135f0f1c615d080359f0bc9cf1c4':
  Core/jni: Remove Dalvik options from AndroidRuntime
2014-12-23 03:44:12 +00:00
Pavel Zhamaitsiak
b45075a7cb Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev 2014-12-23 03:39:07 +00:00
Andreas Gampe
5470c16991 am 2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime"
* commit '2b20efa728f79ef9322930aefbbf0483a578ee74':
  Core/jni: Remove Dalvik options from AndroidRuntime
2014-12-23 03:37:07 +00:00
Andreas Gampe
2b20efa728 Merge "Core/jni: Remove Dalvik options from AndroidRuntime" 2014-12-23 03:29:46 +00:00
Sarah Maddox
7d9309b6e9 am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs
* commit '029acc8ee8e40933c62f19d6f7ced43dca10a6ff':
  docs: Fixes typo on Play services page for Maps.
2014-12-23 03:07:35 +00:00