Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
167,944 Commits 3 Branches 0 Tags
cb313d1a61ab6fa7ad4cb8e264348cfb2b8a3270
Commit Graph

46368 Commits

Author SHA1 Message Date
Narayan Kamath
cb313d1a61 am 856a0d06: am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 
* commit '856a0d06a64b5aebaf2afcc477bfc82308de7c9a':
  Add detailed javadoc for AssetManager.getLocales.
 2014-11-13 15:15:34 +00:00
Jeff Brown
36ed36a2ea am 4d9bd151: am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 
* commit '4d9bd1516f7d495ee16bcfeca95a2ab45e33de4c':
  Make Message.setAsynchronous() public.
 2014-11-13 15:15:28 +00:00
Narayan Kamath
856a0d06a6 am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 
* commit 'eed1fba6b54b3305af811b4dd9e367eab01a241b':
  Add detailed javadoc for AssetManager.getLocales.
 2014-11-13 15:07:51 +00:00
Jeff Brown
4d9bd1516f am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 
* commit 'fef1e0e7f0a6a8d3564031ca4ecf14ab070468ff':
  Make Message.setAsynchronous() public.
 2014-11-13 15:07:46 +00:00
Narayan Kamath
eed1fba6b5 Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-dev 2014-11-13 09:33:12 +00:00
Jeff Brown
fef1e0e7f0 Merge "Make Message.setAsynchronous() public." into lmp-mr1-dev 2014-11-13 07:11:37 +00:00
Adam Lesinski
ffd4785e3c am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 
* commit '648f81064747b58be7ea9efab6d5744d6b49397a':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2014-11-13 00:40:28 +00:00
Adam Lesinski
648f810647 am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 
* commit 'db3d76ab685955aae4a3e363238a2931d89c6f03':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2014-11-13 00:35:58 +00:00
Adam Lesinski
db3d76ab68 Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 2014-11-13 00:33:00 +00:00
Dianne Hackborn
46a318e22f am e91ab7f0: am 377d80ba: Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 
* commit 'e91ab7f0809886861268dde78158ee0f413b58f4':
  Put native apps above browser in resolver activity.
 2014-11-13 00:16:13 +00:00
Dianne Hackborn
e91ab7f080 am 377d80ba: Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 
* commit '377d80ba53d4eda31d131f4f2bd899668cad426b':
  Put native apps above browser in resolver activity.
 2014-11-13 00:07:25 +00:00
Dianne Hackborn
377d80ba53 Merge "Put native apps above browser in resolver activity." into lmp-mr1-dev 2014-11-13 00:03:53 +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
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
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
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
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
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
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
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
George Mount
70cb4f3e71 Merge "Fix getChildVisibleRect to clip correctly." into lmp-mr1-dev 2014-11-12 22:11:45 +00:00
Ignacio Solla
c3631b985f Merge "Fix docs build breakage" into lmp-mr1-dev 2014-11-12 21:58:46 +00:00
Dianne Hackborn
fabb70b2ef Add reporting of Parcel memory/count. 
Also fix issue #18340771: Dumpsys Procstats missing a newline

Change-Id: I0c612187a3fb4d7eeafbf97d373efdef732c477e
 2014-11-12 21:56:30 +00:00
Ignacio Solla
53f2569487 Fix docs build breakage 
Change-Id: Id20a54d8da2b80f277e31c342fffbb3b7d0dc854
 2014-11-12 21:55:47 +00:00
Rob Tsuk
41a8043b30 Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev 2014-11-12 21:42:00 +00:00
Sandeep Siddhartha
5f02d29550 Merge "Don\'t unload the sound model on stopRecognition" into lmp-mr1-dev 
automerge: 850ec91

* commit '850ec91e88c2b0911f8460f909eabf4078b78582':
  Don't unload the sound model on stopRecognition
 2014-11-12 21:17:53 +00:00
Ignacio Solla
10ece9c9d5 Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev 2014-11-12 21:17:07 +00:00
Jeff Sharkey
d68b87cdd4 Recover apps with malformed certificates. 
There was a window of time in Lollipop where we persisted certificates
after they had passed through a decode/encode cycle.  The well-written
OpenSSL library was liberal when decoding (allowing slightly malformed
certs to be parsed), but then strict when encoding, giving us
different bytes for effectively the same certificate.

A related libcore change (0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b)
now returns the original bytes verbatim, fixing both pre-Lollipop
installs and installs after that change.

This change recovers any apps that had been installed during the
window of time described above by doing a one-time check to see if
the certs are effectively equal.

Bug: 18228011
Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d
 2014-11-12 13:16:06 -08:00
Rob Tsuk
4678dcc552 Add a way to override Xfermode DO NOT MERGE 
Add a non-public API to Canvas/GLES20Canvas to provide a way to draw
the touch ripple animation without using a save layer.

Change-Id: I6e2095adffe515194f669fb75bb67abf813bd518
 2014-11-12 12:25:24 -08:00
Sandeep Siddhartha
45c00b5877 Don't unload the sound model on stopRecognition 
This helps us in majority of the scenarios where the sound model doesn't
change across start/stop calls.

Bug: 17954633
Change-Id: Ibff817bb69bc69d2bb3a2603460fed596688b892
 2014-11-12 09:57:27 -08:00
Alan Viverette
0dea93c0ca am c164b97f: am 4fc2ea84: Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev 
* commit 'c164b97f465813e8ef7b52378d48b5af80abb4fa':
  Ensure time picker dialog fits on small screens
 2014-11-12 17:40:23 +00:00
Alan Viverette
c164b97f46 am 4fc2ea84: Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev 
* commit '4fc2ea8402b62001b225bf4e1a335c4cbf3b65ea':
  Ensure time picker dialog fits on small screens
 2014-11-12 17:35:58 +00:00
Alan Viverette
4fc2ea8402 Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev 2014-11-12 17:32:31 +00:00
Alan Viverette
d9f3fdf45b Ensure time picker dialog fits on small screens 
Also fixes dialog padding in landscape mode and a bug in the
ColorStateList method used to apply a selected color.

BUG: 18251582
Change-Id: Id5b8c7893ec42fd4d5f4a7520e6ac170839d3143
 2014-11-12 09:31:22 -08:00
Wale Ogunwale
3ae0d3157d Fixed constant window switching on lock screen with Swype KB. 
We allow TYPE_INPUT_METHOD windows to show on the lock screen.
These windows can attached other types of windows (For this
case the Swype KB was attaching a PopupWinow which will be
of TYPE_APPLICATION). This causes the popup window app token
to be added to the list of apps to be hidden on the lock
screen, thereby preventing the lock screen from been hidden,
which then causes a layout cycle(s). Now, we remove app
tokens for non-app windows from the hidden list in case it
was added by any attached widow they migth have.

Also, when we are updating window animations, set the
hideWhenLocked flag for windows that are IME tragets so
they don't go through unneeded cycles of having their
visibility policy set to hide/show/hide/show/...

Bug: 18021493
Change-Id: I3680256d41793f62def42fda00e26db1dcc990cc
 2014-11-12 08:42:09 -08:00
George Mount
002d43d29b Fix getChildVisibleRect to clip correctly. 
Bug 18292516

getClipVisibleRect now takes into account clipChildren,
clipBounds, and clipToPadding.

Change-Id: I181cd68354e70767868e9edd56bf82a58357391d
 2014-11-12 08:04:34 -08:00
George Mount
fda5336c2f am 57837b9f: am 13b27810: Merge "Remove unnecessary reflection lookup in Animators." into lmp-mr1-dev 
* commit '57837b9fc6ce81d476393684172d1e3ce8271cf0':
  Remove unnecessary reflection lookup in Animators.
 2014-11-12 15:49:39 +00:00
George Mount
13b27810f9 Merge "Remove unnecessary reflection lookup in Animators." into lmp-mr1-dev 2014-11-12 15:42:21 +00:00
Narayan Kamath
11bce123b9 Add detailed javadoc for AssetManager.getLocales. 
bug: 18218661
Change-Id: Idcbd8678b6dd1b28f993c4dab000e284db76edc0
 2014-11-12 13:28:20 +00:00
Narayan Kamath
3a35bf3f9c am 72f9838c: am 222722ee: Merge "Tell installd when boot completes." into lmp-mr1-dev 
* commit '72f9838c99a9cb8d84b8ec4af5372f10eeeb4e94':
  Tell installd when boot completes.
 2014-11-12 12:55:29 +00:00