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

144467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Friedman
cbc3815469 am 0514aba5: am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '0514aba57216b2388f85822b7a39731cd9a9ee7e':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 21:39:29 +00:00
Chris Craik
cd96a6f0de am 52b2ae22: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev 
* commit '52b2ae22c6e1ede01027c83cad33507cbfceabd9':
  [Bitmap] Add null pointer protection in Bitmap_sameAs()
 2014-07-22 21:39:26 +00:00
Alexandra Gherghina
7f9a433e98 am 5f9a77e5: Do Not Merge Per-user API for master sync 
* commit '5f9a77e5337c16335abaa586beab900c25014668':
  Do Not Merge Per-user API for master sync
 2014-07-22 21:39:14 +00:00
Scott Rowe
8d4f88a60f am d6900ec2: am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit 'd6900ec2a6603433e50657a7843966c7d10651ea':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 21:39:09 +00:00
Igor Murashkin
a23eebfd83 am 8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev 
* commit '8f9b6d08fe8b8fc7d8ad88bb68989ebb13dd7aae':
  camera2: Add legacy available Request/Result/Characteristics keys
 2014-07-22 21:39:05 +00:00
Alan Viverette
741fd64fdd am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev 
* commit '290f45f5affaedcc1ad07b531f700e9695e48b3f':
  Add popupTheme attr, propagate from ActionBar to ToolBar
 2014-07-22 21:38:58 +00:00
Alex Klyubin
bfa1d1d1e7 am 09a76692: Align PSKKeyManager with framework API style. 
* commit '09a766924c6b1066d63348d2b9dcb3dcdc561a94':
  Align PSKKeyManager with framework API style.
 2014-07-22 21:38:54 +00:00
Robin Lee
9c2be6c7ba Stop double-loading device admins 
loadSettingsLocked() was being called twice for USER_OWNER at
systemReady(), doubling the number of admin entries at every boot.

Also guards against double-adding admins which appear twice in the
same XML file, favouring more recently-refreshed entries for
backward compatibility.

Previously an application calling in with 'refreshing = true' would
double-insert whatever admin was being refreshed into its user's list
of device admins. This is fixed too.

@bug 16416936

Change-Id: Idd147aa130e6bce7bcc40532f0a7fb07117b3151
 2014-07-22 21:35:09 +00:00
Paul Soulos
2dcab18c6c Adds ScrollBounds to the Transition framework 
Change-Id: If22ab5162737f2d109e5eaf407a735523a146b7f
 2014-07-22 14:17:48 -07:00
Alan Viverette
b97326f067 Make toolbarStyle public 
BUG: 16486273
Change-Id: I2a9f3dbac536307cdd87ea0c50801c80ae96cd94
 2014-07-22 14:05:46 -07:00
Robert Ly
4df9575807 am c12d7e3a: am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit 'c12d7e3a3dc7b3f8df06f59d7fbeb2da84a1a493':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 21:00:07 +00:00
David Friedman
2fe7d87074 am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '42dbe80914b67841c2a8fe93fef8b80e58155684':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:55:55 +00:00
Robert Ly
c12d7e3a3d am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit 'ff428e08a5350153c5f9476551930b0eefdfcd06':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 20:53:20 +00:00
David Friedman
42dbe80914 am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit 'af001f9410bf0a45282b2f0ab7c4c3bf77645697':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:49:09 +00:00
Robert Ly
ff428e08a5 am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit 'c57c08298364e93ca4399d184bdba2657f72b11c':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 20:49:05 +00:00
David Friedman
af001f9410 am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '170b09535d21c7c50051e391b8f7a61678872c2b':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:45:11 +00:00
Sandeep Siddhartha
0edc8cea2b Merge "Make hotword availability a callback" into lmp-dev 2014-07-22 20:44:55 +00:00
Sandeep Siddhartha
f63bc523ea Make hotword availability a callback 
This helps us make the list sound models operation an async one, it also helps us
with the case where a detector is invalidated, so the client doesn't have to keep checking the
state.

Synchronize DatabaseHelper methods on its instance so that other VoiceInteractionManagerService
calls aren't blocked on db writes/reads.
It's still possible for the list operation to be blocked on update and vice-versa

Change-Id: Ib8ec4ac5056b62d443038560ce31d0641b4627b0
 2014-07-22 17:11:52 -07:00
Chris Craik
215ecb93e9 Merge "Restore untrusted glStencilMask value on resume after functor" 2014-07-22 20:34:45 +00:00
Chris Craik
c47aba2a77 Restore untrusted glStencilMask value on resume after functor 
Fixes an issue where the stencil buffer is corrupted
(used in overdraw debugging, path clipping) when used in
conjunction with a HW accelerated WebView.

bug:15023700
bug:16465551

Change-Id: If201b503931380f7107a34e9a9a2f877a50f72b1
 2014-07-22 23:19:02 +00:00
Alexandra Gherghina
0e9ac20d7e Do Not Merge Per-user API for master sync 
Change-Id: I6a8088eb3bfddae4c8e38904dd26baf3c7c09c9e
(cherry picked from commit 222aea8bd997807784dc99ca53f63280d384fdf0)
 2014-07-22 20:15:45 +00:00
Scott Rowe
b192a1762a am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '6b2f3ee3b9954b4b834d6729265acd33ef232b9c':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 20:12:08 +00:00
Scott Rowe
6b2f3ee3b9 am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '2a922cb45a0cb33ef575e39ac8ca4dc8500e03ba':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 20:08:02 +00:00
Scott Rowe
2a922cb45a am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '40b5d8a0e5aad92c07420541fd186f9f96495845':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 20:03:19 +00:00
Alex Klyubin
fcd8b20e09 Align PSKKeyManager with framework API style. 
This CL adjusts android.net.PSKKeyManager as follows:
* Renamed to PskKeyManager to follow naming conventions.
* Changed from interface to abstract class with default
  implementations for all methods.

Bug: 16403305
Bug: 15073623
Change-Id: Iefce26b394d4a753412315dad554b5342f3f0b44
 2014-07-22 19:51:34 +00:00
Jason Monk
a3b8fb0780 am 4a6da95d: am d8288538: Merge "Implement hotspot tile" into lmp-dev 
* commit '4a6da95d7b966d77820c56a3c1bd814add177754':
  Implement hotspot tile
 2014-07-22 19:43:37 +00:00
Jason Monk
76299eafb4 am d8288538: Merge "Implement hotspot tile" into lmp-dev 
* commit 'd82885384d4de3aed8cebc694c702f1e21d33c0a':
  Implement hotspot tile
 2014-07-22 19:40:00 +00:00
Andrew Solovay
93fed6e4af am c15901e3: am 925ad384: am 0ff1ecd1: (-s ours) am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs 
* commit 'c15901e3d8b08e75e64ffa5f479b5d934ad92a9b':
  DO NOT MERGE
 2014-07-22 19:31:12 +00:00
Chris Craik
774c7b9708 am 8040d6fc: (-s ours) am bfb349e2: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" 
* commit '8040d6fccbcba760c503ab954b79a5a87b49d7b3':
  [Bitmap] Add null pointer protection in Bitmap_sameAs()
 2014-07-22 19:26:40 +00:00
Andrew Solovay
980957db36 am 925ad384: am 0ff1ecd1: (-s ours) am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs 
* commit '925ad384007b488205c690c7ca89713c800f3ff1':
  DO NOT MERGE
 2014-07-22 19:20:25 +00:00
Eric Laurent
8f7be7db03 am 842b6b83: am ae61b950: AudioService: wait for init completed to handle media server restart 
* commit '842b6b83f10fdab75d4685ac38578ce4627845ca':
  AudioService: wait for init completed to handle media server restart
 2014-07-22 19:17:12 +00:00
Andrew Solovay
2471498511 am 0ff1ecd1: (-s ours) am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs 
* commit '0ff1ecd1ece73db8d758f227db9d965ef9598f3b':
  DO NOT MERGE
 2014-07-22 19:15:58 +00:00
Chris Craik
2923df5382 am 48242d80: am 50a2d633: Merge "[HWUI] Fix invisible views are still shown in popup window" 
* commit '48242d801c8719f458a615b14b31760ae590006e':
  [HWUI] Fix invisible views are still shown in popup window
 2014-07-22 19:15:43 +00:00
Chris Craik
8040d6fccb am bfb349e2: Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" 
* commit 'bfb349e2421d5b74701818f6aa486f057b2e5884':
  [Bitmap] Add null pointer protection in Bitmap_sameAs()
 2014-07-22 19:15:15 +00:00
Eric Laurent
166e3b5097 am ae61b950: AudioService: wait for init completed to handle media server restart 
* commit 'ae61b950d29a1e2c3237b64513b4b0e6fad77b9b':
  AudioService: wait for init completed to handle media server restart
 2014-07-22 19:12:49 +00:00
Chris Craik
48242d801c am 50a2d633: Merge "[HWUI] Fix invisible views are still shown in popup window" 
* commit '50a2d6339c7a6ee121c4aa52afc4cc027913f3fc':
  [HWUI] Fix invisible views are still shown in popup window
 2014-07-22 19:11:18 +00:00
Andrew Solovay
0ff1ecd1ec am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs 
* commit '3968ae0f70b01592c40c3e0cd31ca5ead953faa0':
  DO NOT MERGE
 2014-07-22 19:08:45 +00:00
Andrew Solovay
3968ae0f70 am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs 
* commit 'eb69126c613dfd476fa516df6ae1c2d78e445f0b':
  DO NOT MERGE
 2014-07-22 19:02:58 +00:00
Andrew Solovay
c96a1f3a6b am aaf871af: am 9bab0bb0: am 3a14c289: am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit 'aaf871af2c3a8ab2133d989079776e5e09e2823e':
  docs: Removed reference to a sample notepad app.
 2014-07-22 19:02:19 +00:00
Sreeram Ramachandran
e0d713afdc am bae0d23d: am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev 
* commit 'bae0d23df8e1461168e229e170247433a3a3ab38':
  Fix WiFi-Direct.
 2014-07-22 18:57:59 +00:00
Andrew Solovay
14ea1133ac am 9bab0bb0: am 3a14c289: am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit '9bab0bb067fdf1c2c899b05e0e0e6411153685fc':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:57:32 +00:00
Eric Laurent
eb4b8a27e3 AudioService: wait for init completed to handle media server restart 
Bug: 16458506.
Change-Id: I25804e6e7209d52fd5dd6c622cae85d1e7d2317f
 2014-07-22 11:55:42 -07:00
Andrew Solovay
c3032874dc am 3a14c289: am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit '3a14c2890e9821a36399b042261d75ee4dfdf71f':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:53:11 +00:00
Sreeram Ramachandran
b12ae58e91 am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev 
* commit '4463fd6540f152fe2548a67eb5a34489c11b3f31':
  Fix WiFi-Direct.
 2014-07-22 18:49:42 +00:00
Andrew Solovay
3a14c2890e am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit 'a2beba70b947a948c2a12513c8bdda4d403c2fd6':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:47:26 +00:00
Andrew Solovay
a2beba70b9 am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit '170556f82bd009cf5a74a53d7ba61221d74d36e9':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:41:21 +00:00
Youngsang Cho
d0b0cbaf1a am e9098289: am 6e65fe21: Merge "Minor comment change of TvContract.Programs.COLUMN_TITLE" into lmp-dev 
* commit 'e909828949473bf22a5c869987651223a55db362':
  Minor comment change of TvContract.Programs.COLUMN_TITLE
 2014-07-22 18:39:30 +00:00
Youngsang Cho
3b1756f958 am 6e65fe21: Merge "Minor comment change of TvContract.Programs.COLUMN_TITLE" into lmp-dev 
* commit '6e65fe21827d51ec393b9d1be3f2440379cb215f':
  Minor comment change of TvContract.Programs.COLUMN_TITLE
 2014-07-22 18:34:11 +00:00
Craig Mautner
91bf127892 am 581feb87: am 90ac517c: Create API for launching from recents 
* commit '581feb87f8a0bcfd14b2b28fd9f06f4e162f10b6':
  Create API for launching from recents
 2014-07-22 18:22:10 +00:00
Craig Mautner
92d0636a0d am 90ac517c: Create API for launching from recents 
* commit '90ac517c8636ce8cbb0afe2fc03836b23206f72a':
  Create API for launching from recents
 2014-07-22 18:17:47 +00:00