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

153876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
acf19975d2 am 24562d7e: Merge "SoundPool.Builder: document default values" into lmp-dev 
* commit '24562d7e5c73c6be3225eff1f53ca4ffa94f09e0':
  SoundPool.Builder: document default values
 2014-08-27 18:29:36 +00:00
Jean-Michel Trivi
c0dce273a8 Merge "SoundPool.Builder: document default values" into lmp-dev 2014-08-27 18:23:00 +00:00
Jeff Sharkey
b80fa969e6 am 542a7796: am 37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev 
* commit '542a77966963147f7b8d4705275628737fa176a0':
  Recreate lib symlink after deleting app data.
 2014-08-27 18:21:48 +00:00
Jeff Sharkey
5bb8bc4754 am bfe28603: am 31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev 
* commit 'bfe28603b7ac6a5faf071fe30bbd1c9272fc69e3':
  Clear pending operation flag when move failed.
 2014-08-27 18:21:43 +00:00
Amith Yamasani
61819d4552 am 22a11865: am 8f3e59d6: am e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 
* commit '22a11865cd6b6aa211217cec070343ad69ffc9a8':
  Fix incorrect reading of multichoice app restrictions
 2014-08-27 18:17:55 +00:00
Eino-Ville Talvala
acc0095bc8 Camera2: Correct error handling 
- Report capture failures from service to application
- Only go to error state for device-level errors
- Adjust binder interface method names to match the service side names
- Reduce failed session creation logging
- Don't fire CaptureSession.onActive for CameraDevice.onBusy
- Check with session to determine capture failure reason

Bug: 17160301
Bug: 15524101
Bug: 14448494
Bug: 11272459

Change-Id: I9dd606004fd7845910dc865738fbe17f1640f07d
 2014-08-27 11:08:18 -07:00
Craig Mautner
8c458e2f95 am 273355f2: am ece9e05d: am b46e78f9: Merge "Revert "Debug for 13924095."" into lmp-dev 
* commit '273355f25f7adb4b4302bdf2bccb04fc49ded9a3':
  Revert "Debug for 13924095."
 2014-08-27 18:08:09 +00:00
Amith Yamasani
1c9a6a965c am 8f3e59d6: am e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 
* commit '8f3e59d674c1766e1566f7b28ebbe175aacdc19e':
  Fix incorrect reading of multichoice app restrictions
 2014-08-27 18:07:42 +00:00
Jeff Sharkey
73306fda9d am 37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev 
* commit '37589a33e8abb534b931b0246143c85f5b4fbb75':
  Recreate lib symlink after deleting app data.
 2014-08-27 18:05:33 +00:00
Jeff Sharkey
da84da1e2e am 31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev 
* commit '31d0207abfbfe15a63028010e0d5230268b94a52':
  Clear pending operation flag when move failed.
 2014-08-27 18:05:28 +00:00
Jeff Sharkey
a9bdc43ec2 Merge "Recreate lib symlink after deleting app data." into lmp-dev 2014-08-27 17:58:38 +00:00
Jeff Sharkey
d1caf731e4 Merge "Clear pending operation flag when move failed." into lmp-dev 2014-08-27 17:58:17 +00:00
Craig Mautner
5f713a86cb am 083f3569: am f9af796e: am a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev 
* commit '083f3569b15b519058e9a136b3680eff673184b4':
  When adding an apptoken skip over removed ones.
 2014-08-27 17:55:40 +00:00
Christopher Tate
bbf98383ff am 155b3a08: am ef89d312: am 96c09773: Merge "Remember having done full-data as well as key/value app backups" into lmp-dev 
* commit '155b3a08eb8eb2575a2cd06d5c8e3c31adb224dd':
  Remember having done full-data as well as key/value app backups
 2014-08-27 17:55:36 +00:00
Craig Mautner
093d4cf542 am ece9e05d: am b46e78f9: Merge "Revert "Debug for 13924095."" into lmp-dev 
* commit 'ece9e05dd4b36ca8eafbbea4c875de84c5c79695':
  Revert "Debug for 13924095."
 2014-08-27 17:55:35 +00:00
Amith Yamasani
0d140b5f4a am e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 
* commit 'e656975cb7be7e883badf3257a2d66b6e664f5e0':
  Fix incorrect reading of multichoice app restrictions
 2014-08-27 17:52:15 +00:00
Jeff Sharkey
c521221740 Recreate lib symlink after deleting app data. 
Bug: 16739202
Change-Id: Ie8dccf67feaf6dfa474d52a3cda0862b952e6762
 2014-08-27 10:47:19 -07:00
Alan Viverette
d7853e5763 Preserve inner drawable bounds and level on mutate 
Also includes a tiny change to progress bar background alpha, which was
too dark to see.

BUG: 17285057
Change-Id: I8b0cc1c2c9405558b8163d8db9374d7c748317a2
 2014-08-27 17:45:28 +00:00
Craig Mautner
d28e611436 am b46e78f9: Merge "Revert "Debug for 13924095."" into lmp-dev 
* commit 'b46e78f9e04dc7a292be2a3f50d72dc453a2891b':
  Revert "Debug for 13924095."
 2014-08-27 17:40:57 +00:00
Amith Yamasani
032402cff1 Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 2014-08-27 17:39:29 +00:00
Craig Mautner
fb3fdb9495 am f9af796e: am a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev 
* commit 'f9af796e5ae81a7eb7775d36d6f8278af0fa9920':
  When adding an apptoken skip over removed ones.
 2014-08-27 17:38:50 +00:00
Christopher Tate
5a27424d4e am ef89d312: am 96c09773: Merge "Remember having done full-data as well as key/value app backups" into lmp-dev 
* commit 'ef89d312499a8332e2d1e7f882a1740448f00f5f':
  Remember having done full-data as well as key/value app backups
 2014-08-27 17:38:44 +00:00
Amith Yamasani
e084039dd2 Fix incorrect reading of multichoice app restrictions 
Clear the list of choices values before putting new ones in.

Bug: 17299310
Change-Id: I01051d1703adcbdd7d0b5fb4ee423404f98489e8
 2014-08-27 10:33:17 -07:00
Craig Mautner
d4b325a82b Merge "Revert "Debug for 13924095."" into lmp-dev 2014-08-27 17:29:58 +00:00
Julia Reynolds
f1e13ba1a2 am f7f6b67d: am 68ddd6d9: am e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev 
* commit 'f7f6b67dfc68404e9b18e944ff0ef8ae2c0465b0':
  Limit the settings profile/device owners can update.
 2014-08-27 17:28:28 +00:00
Jeff Sharkey
1c9edafef8 Clear pending operation flag when move failed. 
Bug: 17298448
Change-Id: I7a4af0f31d3909a9bfb5a2dd7d168015786024e3
 2014-08-27 10:24:59 -07:00
Craig Mautner
6405a2b879 am a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev 
* commit 'a1ca6e00143dfe8f62c4f888ad8cac79be41d5b4':
  When adding an apptoken skip over removed ones.
 2014-08-27 17:20:31 +00:00
Christopher Tate
00568d35f4 am 96c09773: Merge "Remember having done full-data as well as key/value app backups" into lmp-dev 
* commit '96c097737bf7874b240f86b313d561fe1f14678e':
  Remember having done full-data as well as key/value app backups
 2014-08-27 17:20:26 +00:00
Calin Juravle
3aed587344 am 54d3fbb1: am d5f23f2e: am 2d3571cc: Merge "Fix the length of a profiler system property" 
* commit '54d3fbb17b63785740257b9920bfcd52fab9ad24':
  Fix the length of a profiler system property
 2014-08-27 17:14:30 +00:00
Makoto Onuki
63d3e8fe01 am a3ed4ae9: am 1a8674f1: am d37368bf: Address API review comments: 
* commit 'a3ed4ae9578a49981e40746614940de1b54ccf25':
  Address API review comments:
 2014-08-27 17:14:24 +00:00
Joe Fernandez
d93a9abf0c am c48397eb: am 2838b622: am 37bd72c6: am 402282f3: am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit 'c48397eb53b8b270952bbcd657c08879b7d429fc':
  docs: add warning to redirects file
 2014-08-27 17:14:19 +00:00
Craig Mautner
d266368435 Merge "When adding an apptoken skip over removed ones." into lmp-dev 2014-08-27 17:14:18 +00:00
Julia Reynolds
cf24b10343 am 68ddd6d9: am e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev 
* commit '68ddd6d92d3b09b4f6ecdb9621b7997414d501e2':
  Limit the settings profile/device owners can update.
 2014-08-27 17:13:04 +00:00
Jorim Jaggi
15dac5f35b Make it possible to disable camera on lockscreen 
Bug: 16807006
Change-Id: I8f439c22d481d52c7edf46d0caf78e26dfeb64e8
 2014-08-27 19:08:26 +02:00
Craig Mautner
4e1b6a4e59 Revert "Debug for 13924095." 
This reverts commit 76309cd761a0f9d9e44435ba9a4bde8363ba9f7b.

Logspam no longer useful, just annoying now.

Change-Id: I826d383101077cc1bb341d4a3186ef98ed7e0c00
 2014-08-27 10:07:55 -07:00
Raph Levien
6fb0444124 am 792877b1: am 6dcfc268: am b73047ff: Merge "New weight-aware font config" into lmp-dev 
* commit '792877b1765687f1f8c748aa063d99b08ea5c99c':
  New weight-aware font config
 2014-08-27 17:07:38 +00:00
Raph Levien
50f23d75f7 am 6f2e4a9f: am bdd95259: am 145f5780: Merge "Fix incorrect return value on missing glyph" into lmp-dev 
* commit '6f2e4a9f8ae13526cdd73ee28d4927197ada5629':
  Fix incorrect return value on missing glyph
 2014-08-27 17:07:34 +00:00
Ricardo Cervera
29c4ac61f3 am 85c0ac8c: am 6c885e6f: am b37b252a: am 665fc318: am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit '85c0ac8c3c8e2d15ba8658815e04e81c3b4cc028':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 17:07:29 +00:00
Ricardo Cervera
1e348de097 am c2dd8ed8: am 300b212c: am d3288173: am 76428e01: am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit 'c2dd8ed8e2edfcaefd4f3c7b034cd45b14ed2fbb':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 17:07:24 +00:00
Ricardo Cervera
f6821d2380 am 2d1bda26: am 8dd47a7e: am d7a3ae38: am 1f6a16f1: am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit '2d1bda2649bb65e3ecf1d34e43a618b48e152cbd':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 17:07:16 +00:00
Baligh Uddin
a3750b8eed am 2749fa5c: (-s ours) am 3aa96926: (-s ours) am 7f74dffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '2749fa5c261d5540a45f4c333ada0c78a16796e4':
  Import translations. DO NOT MERGE
 2014-08-27 17:07:11 +00:00
Baligh Uddin
b4e574cfcf am 3a0de694: (-s ours) am 753fcdd4: (-s ours) am d87aa19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '3a0de6943448f550a9fd786607b8abe606ca016a':
  Import translations. DO NOT MERGE
 2014-08-27 17:07:07 +00:00
Baligh Uddin
d75ae8c763 am 41b62c39: (-s ours) am 2dd99c5b: (-s ours) am 550578f5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '41b62c395f811a9cfa056555437577a0cd27fb87':
  Import translations. DO NOT MERGE
 2014-08-27 17:07:02 +00:00
Calin Juravle
b052d34e7d am 5b2d2351: am 2f63f7ab: am 852debcc: Merge "Update the handling of the native bridge property." 
* commit '5b2d2351f80c2dbb1b23228135677750ee39c944':
  Update the handling of the native bridge property.
 2014-08-27 17:06:30 +00:00
Calin Juravle
c8008d451e am f7fe4cb4: am 9dcfcff9: (-s ours) am 3bec87c9: Merge "Pass vmSafeMode (manifest attribute) to installd." 
* commit 'f7fe4cb4d070a767f425c098a258d0bc5b19d063':
  Pass vmSafeMode (manifest attribute) to installd.
 2014-08-27 17:06:22 +00:00
Christopher Tate
eee0ea201f Merge "Remember having done full-data as well as key/value app backups" into lmp-dev 2014-08-27 17:06:13 +00:00
Jorim Jaggi
2d33b1f630 am 925aedb0: am 3d9509d3: am ddf411d6: Merge "Fix that Keyguard didn\'t always get onActivityDrawn call" into lmp-dev 
* commit '925aedb08fcf81994e95424144744feadd5097a7':
  Fix that Keyguard didn't always get onActivityDrawn call
 2014-08-27 17:06:09 +00:00
Jorim Jaggi
c2236c67ef am 05440791: am af168d78: am 0f72ddc2: Merge "Fix missing status bar icons" into lmp-dev 
* commit '05440791af68619225902fafe13da54fabf23884':
  Fix missing status bar icons
 2014-08-27 17:06:04 +00:00
John Spurlock
90d65e7b7e am 3d1a8371: am de0bcb8e: am b916b16a: Merge "Doze: Better handling for non-default templates." into lmp-dev 
* commit '3d1a83716e27fd2cafcd0e46d13cfa1394727212':
  Doze: Better handling for non-default templates.
 2014-08-27 17:05:53 +00:00
Sander Alewijnse
b6c0fc8625 am 12df8729: am 45fb047d: am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev 
* commit '12df87292e529a13ae033cda7197abacdd68b9ee':
  Provide lockdown of date/time device owners.
 2014-08-27 17:05:48 +00:00