drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,153 Commits 1 Branch 0 Tags
Commit Graph

172153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
1539c267c7 am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 
* commit 'be8053a23c0f0b15697176f0cd5e322b30d474e1':
  Fixed grammar in the comment that introduces the Debug.MemoryInfo class.
 2014-12-29 12:20:16 +00:00
Narayan Kamath
be8053a23c am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 
* commit '5ae63a258b78c4982a6c4ae984b86bb7b2db1dd4':
  Fixed grammar in the comment that introduces the Debug.MemoryInfo class.
 2014-12-29 12:14:41 +00:00
Narayan Kamath
5ae63a258b Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 2014-12-29 12:08:58 +00:00
Narayan Kamath
1cc57aba81 am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing" 
* commit '1bafd01a3fc5f94e77d1c18e5a7dcdecddcaa47f':
  Fix "pm list permissions" crash if resource string missing
 2014-12-29 11:13:22 +00:00
Narayan Kamath
1bafd01a3f am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing" 
* commit '44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a':
  Fix "pm list permissions" crash if resource string missing
 2014-12-29 11:06:53 +00:00
Narayan Kamath
44a5a30a61 Merge "Fix "pm list permissions" crash if resource string missing" 2014-12-29 11:01:28 +00:00
Narayan Kamath
7e6ae353f0 am 7d019394: am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 
* commit '7d019394f7ca2f047e9c3d2a98b5c23b223c6689':
  Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"
 2014-12-29 10:12:55 +00:00
Narayan Kamath
7d019394f7 am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 
* commit '712a02050e7be4479f12a81aeb23d7217b8d7a8d':
  Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"
 2014-12-29 10:07:13 +00:00
Narayan Kamath
712a02050e Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 2014-12-29 10:02:28 +00:00
Craig Mautner
3551ce9d8e am 443d1a6a: am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible" 
* commit '443d1a6ae3b9550a4a1b46926b336c1a534db2f4':
  [ActivityManager] Reset ActivityRecord's waitingVisible
 2014-12-29 01:56:42 +00:00
Craig Mautner
443d1a6ae3 am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible" 
* commit 'cfa31a605cda26a556009ddd4eae83085e74339b':
  [ActivityManager] Reset ActivityRecord's waitingVisible
 2014-12-29 01:44:25 +00:00
Craig Mautner
cfa31a605c Merge "[ActivityManager] Reset ActivityRecord's waitingVisible" 2014-12-29 01:30:50 +00:00
John Spurlock
bbe3087ec0 am af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev 
automerge: db41690

* commit 'db416907b831010cc2854292aa7de85fd8857a77':
  Audio Policy: Clear calling identity for all paths setting ringer mode.
 2014-12-28 05:42:43 +00:00
Baligh Uddin
3ab0f694e0 am 45c6ae56: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: bedfb2f  -s ours

* commit 'bedfb2faecc4ddc83cf368d0db5c10776236a49b':
  Import translations. DO NOT MERGE
 2014-12-28 05:41:16 +00:00
Baligh Uddin
98ff0febf4 am 4acca673: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: 378939f  -s ours

* commit '378939f0580c615e21a5c9b17565b2822f326559':
  Import translations. DO NOT MERGE
 2014-12-28 05:39:56 +00:00
Baligh Uddin
b19d7ef86d Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: c5d0323  -s ours

* commit 'c5d0323c125ff5ec687286c308386f81d7e132d9':
  Import translations. DO NOT MERGE
 2014-12-28 05:38:49 +00:00
Baligh Uddin
4fa11af768 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: b0e2d4c  -s ours

* commit 'b0e2d4c7f1b4280880e28335af0cea13af6902b4':
  Import translations. DO NOT MERGE
 2014-12-28 05:37:29 +00:00
Robin Lee
b6b7d4251c am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev 
automerge: c9db16c

* commit 'c9db16c59164d865b92e4527fb479fb892c5d4bb':
  Revert "DevicePolicy: Don't warn about managed profile CAs"
 2014-12-28 05:36:20 +00:00
Baligh Uddin
4ac5f68b56 am 83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: cecabf4  -s ours

* commit 'cecabf48ae85943b9c0e5b4805299794f5f3b857':
  Import translations. DO NOT MERGE
 2014-12-28 05:35:06 +00:00
Baligh Uddin
fc9bedb4b2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: f17490f  -s ours

* commit 'f17490f5c202676c3a2e6f27c445f334509d8f59':
  Import translations. DO NOT MERGE
 2014-12-28 05:33:41 +00:00
Pavel Zhamaitsiak
73cce93c07 am b45075a7: Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev 
automerge: 48fd168

* commit '48fd1688a27519b14959b1c181f1fa8178836997':
  Add configuration indicating whether TTY over VoLTE is supported.
 2014-12-28 05:32:24 +00:00
Amit Mahajan
4b2cbae9cf am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev 
automerge: 4f68c0c

* commit '4f68c0c1d8811d610021d97839af303c2752eff2':
  IMS: add the api to get IMS registration information.
 2014-12-28 05:29:52 +00:00
Jinsuk Kim
0abbba9f42 am 266f2b04: am 92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 
* commit '266f2b047ebfb80a7fa72da302988fba4c902f43':
  CEC: Let the caller check CEC device type
 2014-12-26 20:30:42 +00:00
Robert Greenwalt
ce524dc683 am 33868dab: am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev 
* commit '33868dab9af09d61634f1f7ab3a8c704aacd0de0':
  Fix timing between bcast and net setup.
 2014-12-26 20:30:32 +00:00
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
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
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
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
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
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
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