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

178989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
6992a0da6d Import translations. DO NOT MERGE 
Change-Id: I0bb0474b2fb440480ae9eaef1266be341acc89f4
Auto-generated-cl: translation import
 2014-12-29 12:54:36 -08:00
Glenn Kasten
cd4ac0a204 Merge "Fix build" 2014-12-29 19:08:48 +00:00
Glenn Kasten
41edd7cb86 Merge "Update API documentation for static AudioTrack" 2014-12-29 19:08:04 +00:00
Andre Eisenbach
52e7e6fe3b am 1d23da91: am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 
automerge: d5e2fa0

* commit 'd5e2fa0bed602a1eb45afb41dc64a09d60e91a44':
  Exclude unnecessary intents in SystemUI
 2014-12-29 18:45:50 +00:00
Andre Eisenbach
d5e2fa0bed am 1d23da91: am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 
* commit '1d23da911a698ee1cc0503118f661ef0609ea8e9':
  Exclude unnecessary intents in SystemUI
 2014-12-29 18:42:03 +00:00
Andre Eisenbach
1d23da911a am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 
* commit 'd7d9cdaebb30df5564b5787ee02d4624673c8523':
  Exclude unnecessary intents in SystemUI
 2014-12-29 18:36:27 +00:00
Svetoslav
64e5f085a7 am 72da9ed8: am e5ea48a7: Fix a race in accessibility manager. 
automerge: 1261ee8

* commit '1261ee87a8c781c949d8fbbe4c7990963f5a3155':
  Fix a race in accessibility manager.
 2014-12-29 18:32:28 +00:00
Andre Eisenbach
d7d9cdaebb Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 2014-12-29 18:32:22 +00:00
Svetoslav
1261ee87a8 am 72da9ed8: am e5ea48a7: Fix a race in accessibility manager. 
* commit '72da9ed8867a3b3d6a9ae829b9a0ae526c16915c':
  Fix a race in accessibility manager.
 2014-12-29 18:30:47 +00:00
Svetoslav
72da9ed886 am e5ea48a7: Fix a race in accessibility manager. 
* commit 'e5ea48a7fe295a2815bab57f2e870901ce48b312':
  Fix a race in accessibility manager.
 2014-12-29 18:23:54 +00:00
Svetoslav
e5ea48a7fe Fix a race in accessibility manager. 
The accessibility manager has APIs for clients to observe changes
in accessibility, touch exploration, and high contrast states. The
notification of the listeners has to be done with no lock held but
in an attempt to do that the code was incorrectly iterating over
the copy on write collection.

bug:18840784

Change-Id: I6803ff1657fbf6b0cc7936671d5bbdebb5cbf6bb
 2014-12-29 09:40:46 -08:00
Narayan Kamath
df44485698 am c97d1fbb: am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings." 
automerge: bf0c614

* commit 'bf0c614d33673a0a037e317c8c25ad2e6c24e77d':
  Throw IllegalArgumentException on invalid hex-strings.
 2014-12-29 16:22:57 +00:00
Narayan Kamath
bf0c614d33 am c97d1fbb: am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings." 
* commit 'c97d1fbbe00a91b1a67b7c526d9cf11ffec741fa':
  Throw IllegalArgumentException on invalid hex-strings.
 2014-12-29 16:20:32 +00:00
Glenn Kasten
b5e5efbab8 Fix build 
Change-Id: I1119c37ac317d0ce86c53a6c134c664d2f1c2cb3
 2014-12-29 08:17:56 -08:00
Narayan Kamath
c97d1fbbe0 am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings." 
* commit '5106dd44f9e5877aee8e70711c026e9e23783d4c':
  Throw IllegalArgumentException on invalid hex-strings.
 2014-12-29 16:15:04 +00:00
Narayan Kamath
5106dd44f9 Merge "Throw IllegalArgumentException on invalid hex-strings." 2014-12-29 16:08:34 +00:00
Narayan Kamath
972c24291e am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 
automerge: 1539c26

* commit '1539c267c7f4678434361b3fac3f56abcbb19f56':
  Fixed grammar in the comment that introduces the Debug.MemoryInfo class.
 2014-12-29 12:21:25 +00:00
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
45159937bc am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing" 
automerge: 1cc57ab

* commit '1cc57aba8128134f55b6d5e4f4800c51e3472828':
  Fix "pm list permissions" crash if resource string missing
 2014-12-29 11:14:51 +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
Esteban Talavera
ea84327fa4 Merge "Remove deprecated version of setProfileOwner that takes packageName" 2014-12-29 10:55:31 +00:00
Narayan Kamath
d44222135e am 7d019394: am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 
automerge: 7e6ae35

* commit '7e6ae353f022426d52df77acca4d0ded58b939b5':
  Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"
 2014-12-29 10:15:50 +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
Sungsoo Lim
2021082b4a Merge "Make mute/unmute work" 2014-12-29 04:52:21 +00:00
Sungsoo Lim
d1851e6e4e Make mute/unmute work 
Bug: 18844550
Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb
 2014-12-29 11:34:23 +09:00
Craig Mautner
ebc440ea5d am 443d1a6a: am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible" 
automerge: 3551ce9

* commit '3551ce9d8e8244376d63b65e0352ffa03198ba2a':
  [ActivityManager] Reset ActivityRecord's waitingVisible
 2014-12-29 01:59: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
aa5adac6d2 am af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev automerge: db41690 
automerge: bbe3087

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

* commit '3ab0f694e0a5241c347f5a158683a66a328a415b':
  Import translations. DO NOT MERGE
 2014-12-28 05:56:40 +00:00
Baligh Uddin
32518b17d9 am 4acca673: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev automerge: 378939f -s ours 
automerge: 98ff0fe  -s ours

* commit '98ff0febf4c93504f07b024aab4645b5ad5548ec':
  Import translations. DO NOT MERGE
 2014-12-28 05:55:15 +00:00
Baligh Uddin
e30aa49748 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: c5d0323 -s ours 
automerge: b19d7ef  -s ours

* commit 'b19d7ef86d70707c8c2bc857e025572f0ece964d':
  Import translations. DO NOT MERGE
 2014-12-28 05:53:52 +00:00
Baligh Uddin
cff138dab4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: b0e2d4c -s ours 
automerge: 4fa11af  -s ours

* commit '4fa11af7682f4b2776d7bc5bc934ef02f5a7901d':
  Import translations. DO NOT MERGE
 2014-12-28 05:52:40 +00:00
Robin Lee
77f9a44adb am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev automerge: c9db16c 
automerge: b6b7d42

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

* commit '4ac5f68b563b432a0728e430c42dafec4045631d':
  Import translations. DO NOT MERGE
 2014-12-28 05:49:55 +00:00
Baligh Uddin
b71829c781 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: f17490f -s ours 
automerge: fc9bedb  -s ours

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

* commit '73cce93c07e871ad0fddf8a60a12e07660687d66':
  Add configuration indicating whether TTY over VoLTE is supported.
 2014-12-28 05:47:12 +00:00
Amit Mahajan
6162c699ad am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev automerge: 4f68c0c 
automerge: 4b2cbae

* commit '4b2cbae9cfd941633eadf9b667b3e3e0372c1ad2':
  IMS: add the api to get IMS registration information.
 2014-12-28 05:45:47 +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