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

168130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
8cb8a73e80 am f6250952: (-s ours) am 57f06e94: (-s ours) am 2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f625095204b76d5ddc1b32a8ce993da5172f9a64':
  Import translations. DO NOT MERGE
 2014-11-13 00:00:49 +00:00
xinhe
c93802b993 Update enabe/disableCellBroadcast with RAN argument 
Allow them to take an explicit argument indicating GSM or CDMA range and
fix the extreme alert disable error.

Bug: 18202935
Change-Id: Ibf12be65c60807834705e7cc9e94ec485ce6b60a
 2014-11-12 15:58:16 -08:00
Renato Mangini
8d6699cc97 am 19865ccd: am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '19865ccd44958b0902b9eedd11df279a03ff74c1':
  Fix the order of sample categories left nav.
 2014-11-12 23:53:17 +00:00
Andrew Lee
840162d2b4 Add telephony.DisconnectCause for merged IMS call. 
When merged, IMS calls are consolidated into one call. Thus they
"disconnect", even though the user can continue to comminucate
with the party on that call.

We want to recognize this scenario so we can control relevant
behaviors (ie.don't play the "end call" tone in this case).

Bug: 18291234
Change-Id: I93247f88ed74467470504bec88fcfb7ed714f0ff
 2014-11-12 15:52:32 -08:00
Etan Cohen
8cb9ea4901 am c3dfc340: am 00ead120: Fix VoLTE configuration on secondary TMO MCC/MNC. 
* commit 'c3dfc340124ebb2e2e4cc46114ede74d5b9ebf88':
  Fix VoLTE configuration on secondary TMO MCC/MNC.
 2014-11-12 23:51:34 +00:00
George Mount
cc66b9dfda am 4978ebe0: am fa781f8c: Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 
* commit '4978ebe04f4c06f5672e734665c592838a5d634b':
  Update GhostView properly when underlying view changes.
 2014-11-12 23:51:25 +00:00
Jeff Sharkey
bea6648df5 am a2781fda: am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates. 
* commit 'a2781fdac332c4f6277a986c88e34daa25a3b5f9':
  Recover apps with malformed certificates.
 2014-11-12 23:50:47 +00:00
Alan Viverette
469e72ffe7 am 5f876974: am 667ec63c: Merge "Don\'t propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev 
* commit '5f876974d025406cd48eac9759989c09c899a4dd':
  Don't propagate AnimatedStateListDrawable state change to super()
 2014-11-12 23:49:46 +00:00
George Mount
a6d33fd7ba am 3ba2c7c6: am 70cb4f3e: Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 
* commit '3ba2c7c681f3bf355cef1c6e32a6fdf315865f57':
  Fix getChildVisibleRect to clip correctly.
 2014-11-12 23:49:40 +00:00
Ignacio Solla
4fc66e582a am ba1d4cd4: am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev 
* commit 'ba1d4cd4fe65e60ba3eaef9cfbe93cb99424ef47':
  Fix docs build breakage
 2014-11-12 23:49:31 +00:00
Dianne Hackborn
7437ec8e1d am caf3cddd: am fabb70b2: Add reporting of Parcel memory/count. 
* commit 'caf3cddd5bff11a20e72e7df54b826e33d2fe6a9':
  Add reporting of Parcel memory/count.
 2014-11-12 23:49:25 +00:00
Rob Tsuk
6552afa878 am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 
* commit 'ccc956b2b4602dca28f7c79d1155df29bcc0d696':
  Add a way to override Xfermode DO NOT MERGE
 2014-11-12 23:49:19 +00:00
Ignacio Solla
fd003c707e am dfb25b3d: am 10ece9c9: Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev 
* commit 'dfb25b3dec64fb9537d5f34771b7f4a1812925b9':
  [WebView] Interface to access hidden APIs.
 2014-11-12 23:49:13 +00:00
ztenghui
5679d937ff am ab6515f6: am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev 
* commit 'ab6515f6214a09e23deee4b432b41d1849ae403f':
  Shadow: Fix the crash in spot shadow
 2014-11-12 23:49:08 +00:00
Renato Mangini
19865ccd44 am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '5d7f91c77605a5c444eaaae2b812280c57ca244c':
  Fix the order of sample categories left nav.
 2014-11-12 23:47:14 +00:00
Geoff Mendal
f625095204 am 57f06e94: (-s ours) am 2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '57f06e94eb10bfb4edcfe452eb683a920d19ec77':
  Import translations. DO NOT MERGE
 2014-11-12 23:46:00 +00:00
Geoff Mendal
57f06e94eb am 2d28d697: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '2d28d697f6235c497237a11abb973b9109999e38':
  Import translations. DO NOT MERGE
 2014-11-12 23:41:57 +00:00
ztenghui
c3e29108fc am d46cf713: Merge "AVD: Requires all animator has stopped before start again." into lmp-mr1-dev automerge: ffcb5e2 
* commit 'd46cf7138a955d004911bbd637535390030b328f':
  AVD: Requires all animator has stopped before start again.
 2014-11-12 23:40:21 +00:00
Alan Viverette
84ed482ff9 am 1c252a6f: Merge "Fix default attributes in ScaleDrawable" into lmp-mr1-dev automerge: 26478ba 
* commit '1c252a6f8b3dbeb7aa533203731256b3b037d3e2':
  Fix default attributes in ScaleDrawable
 2014-11-12 23:40:10 +00:00
Eric Laurent
33fc23701a am ac598888: Merge "audiosystem JNI: check env pointer before use." into lmp-mr1-dev automerge: edd4a22 
* commit 'ac598888e3efbb6fda910ac8bef3bc92811309ba':
  audiosystem JNI: check env pointer before use.
 2014-11-12 23:40:05 +00:00
Sandeep Siddhartha
41dc467957 am 5f02d295: Merge "Don\'t unload the sound model on stopRecognition" into lmp-mr1-dev automerge: 850ec91 
* commit '5f02d29550588a17add0b83f7e7bfcd324f20778':
  Don't unload the sound model on stopRecognition
 2014-11-12 23:39:50 +00:00
Ruben Brunk
091bf0cc46 am b70dca2d: Merge "Frameworks/base: Right transform in DngCreator" into lmp-mr1-dev automerge: 68ced89 
* commit 'b70dca2d21fd73e77329b07175ca3fb25bc02774':
  Frameworks/base: Right transform in DngCreator
 2014-11-12 23:39:27 +00:00
Renato Mangini
5d7f91c776 am 40ac90e9: am 1b657d92: Fix the order of sample categories left nav. 
* commit '40ac90e99da90956f26cf7f7bb4c205e28bbbc66':
  Fix the order of sample categories left nav.
 2014-11-12 23:39:11 +00:00
Geoff Mendal
2d28d697f6 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-12 23:37:57 +00:00
Renato Mangini
40ac90e99d am 1b657d92: Fix the order of sample categories left nav. 
* commit '1b657d924301d1caa132797f2ab397ba48429e6b':
  Fix the order of sample categories left nav.
 2014-11-12 23:33:47 +00:00
Cheuksan Wang
f9c50c45c6 new sms/mms carrier app API 
BUG: 18005911

Change-Id: Ib961badc1ccac270f1244f8d971d9abec324b73f
 2014-11-12 15:29:41 -08:00
Etan Cohen
c3dfc34012 am 00ead120: Fix VoLTE configuration on secondary TMO MCC/MNC. 
* commit '00ead12087846eed465ffa5c9989878e7d2d0784':
  Fix VoLTE configuration on secondary TMO MCC/MNC.
 2014-11-12 23:29:08 +00:00
Etan Cohen
00ead12087 Fix VoLTE configuration on secondary TMO MCC/MNC. 
Added in ag/573693. But underlying mechanism changed in ag/573692 and
not adjusted.

Change-Id: I2e4784df38ba35aec477d657753974b7918b08b0
 2014-11-12 23:23:08 +00:00
Ye Wen
bdc3a46312 Delay connecting to MmsService until APIs are called for imms 
Eagerly connecting to MmsService in MmsServiceBroker during system
bootup caused a 2-second delay. Removing the connection in this CL. The
connection will be made when any of the API is called.

b/18085396

Change-Id: I201abcb5f8c5ac69e347e2c69fd20b8215bb0654
 2014-11-12 15:15:49 -08:00
George Mount
4978ebe04f am fa781f8c: Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 
* commit 'fa781f8c2cdbd176d8ab8c9c82fcd6496e73e3be':
  Update GhostView properly when underlying view changes.
 2014-11-12 23:14:55 +00:00
George Mount
fa781f8c2c Merge "Update GhostView properly when underlying view changes." into lmp-mr1-dev 2014-11-12 23:10:35 +00:00
Geoff Mendal
978f85c3da Import translations. DO NOT MERGE 
Change-Id: I3395ff410dc14afb14c0626368fd66da77996963
Auto-generated-cl: translation import
 2014-11-12 15:01:37 -08:00
Jeff Sharkey
a2781fdac3 am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates. 
* commit '521ca5f8fba355f526e82dc3a8fc6520e4379874':
  Recover apps with malformed certificates.
 2014-11-12 22:54:47 +00:00
Ignacio Solla
451e338c51 [WebView] Allow the WebView to be compiled against the system SDK. 
BUG:18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
 2014-11-12 22:49:56 +00:00
Alan Viverette
5f876974d0 am 667ec63c: Merge "Don\'t propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev 
* commit '667ec63c9ed695ca71f6639f18c31995fb8ff880':
  Don't propagate AnimatedStateListDrawable state change to super()
 2014-11-12 22:46:14 +00:00
George Mount
3ba2c7c681 am 70cb4f3e: Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 
* commit '70cb4f3e7131cda1e58c1f6d422e296c4935289d':
  Fix getChildVisibleRect to clip correctly.
 2014-11-12 22:46:08 +00:00
Ignacio Solla
ba1d4cd4fe am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev 
* commit 'c3631b985f51fcce97b0111cdd8297a58c44a5ec':
  Fix docs build breakage
 2014-11-12 22:41:56 +00:00
Dianne Hackborn
caf3cddd5b am fabb70b2: Add reporting of Parcel memory/count. 
* commit 'fabb70b2efbd125f74923d19ab12bc8e1371ed1f':
  Add reporting of Parcel memory/count.
 2014-11-12 22:41:51 +00:00
Alan Viverette
4acd0ecc7b Account for window bounds in accessibility view click point computation 
BUG: 18177402
Change-Id: If591d1b9e5a8a7c4cade3ef4f3ec5e42d623b53c
 2014-11-12 22:37:36 +00:00
Rob Tsuk
ccc956b2b4 am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 
* commit '41a8043b30a289bdba55a2469e598b3fe67c3bf1':
  Add a way to override Xfermode DO NOT MERGE
 2014-11-12 22:36:18 +00:00
Ignacio Solla
dfb25b3dec am 10ece9c9: Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev 
* commit '10ece9c9d5c2134a6ea04bf593a2b76d167dbd7a':
  [WebView] Interface to access hidden APIs.
 2014-11-12 22:36:09 +00:00
ztenghui
ab6515f621 am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev 
* commit '4e50ee4f42e4fdf753b9f681a6236f4a46e25bb0':
  Shadow: Fix the crash in spot shadow
 2014-11-12 22:36:04 +00:00
Jeff Sharkey
521ca5f8fb am 2e700004: am d68b87cd: Recover apps with malformed certificates. 
* commit '2e7000040e3d836bb591e29515974817afc49488':
  Recover apps with malformed certificates.
 2014-11-12 22:24:24 +00:00
Jeff Sharkey
2e7000040e am d68b87cd: Recover apps with malformed certificates. 
* commit 'd68b87cdd402d46013170d9316a31c82be4e4816':
  Recover apps with malformed certificates.
 2014-11-12 22:20:46 +00:00
Alan Viverette
667ec63c9e Merge "Don't propagate AnimatedStateListDrawable state change to super()" into lmp-mr1-dev 2014-11-12 22:19:06 +00:00
Wale Ogunwale
2a32d9f6d3 resolve merge conflicts of 2755644 to lmp-mr1-ub-dev. 
automerge: 89b3ecc

* commit '89b3ecc7b38f9e0601c36176834a66af0f825193':
  Fix build breakage from missing close brace.
 2014-11-12 22:15:08 +00:00
Andreas Gampe
bfe6333c3c Frameworks/base: New GL bindings 
Generated new bindings after glgen update.

Change-Id: I96f2e3eee99f1e12ad84aa10e8f7826a905e909c
 2014-11-12 14:12:45 -08:00
George Mount
70cb4f3e71 Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 2014-11-12 22:11:45 +00:00
Renato Mangini
1b657d9243 Fix the order of sample categories left nav. 
Bug: 18323953
Change-Id: Iea882fed74428d092c02e3cfcf2171c4c596b8a8
 2014-11-12 14:07:48 -08:00
Ignacio Solla
c3631b985f Merge "Fix docs build breakage" into lmp-mr1-dev 2014-11-12 21:58:46 +00:00