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

176374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
48af2cf8cd am 83c0b096: am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '83c0b096b775e7b39f89c2da1c9a8193555c0178':
  Separate voice/data roaming state and type
 2014-12-04 20:45:03 +00:00
Eino-Ville Talvala
1aef3b1eb4 am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit '431b65d11fa79ee1acf55e1de0d074fe9913a51d':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-04 20:44:58 +00:00
Dianne Hackborn
c22369be46 am 3c8a439b: am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 
* commit '3c8a439be33932f35b723271cec5cd4210c19221':
  Fix issue #17948584: Application crash and phone restart when app...
 2014-12-04 20:44:53 +00:00
Alan Viverette
1a1b89485d am 979ed514: am 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 
* commit '979ed5140baf4e89d0aaaec39c0c2b8033c401bf':
  Slightly more button elevation to match Material spec
 2014-12-04 20:44:49 +00:00
Dianne Hackborn
722dee3e6c am 11bee890: am 4c4e4686: am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev 
* commit '11bee890a24b05d099be87b02ea667441e573898':
  Fix issue #18607384: Run fstrim after every system update
 2014-12-04 20:44:44 +00:00
Yin-Chia Yeh
e01ae15296 am e168dd28: am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev 
* commit 'e168dd28f8fedc921e8b08bdce71c20ab60966ee':
  Camera: update antibanding spec
 2014-12-04 20:44:39 +00:00
Robert Greenwalt
83c0b096b7 am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '98f81182fb61953e0712bd788941710b6ad842c2':
  Separate voice/data roaming state and type
 2014-12-04 20:23:55 +00:00
Eino-Ville Talvala
431b65d11f am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit '6e21817b8ef160fae5e7046745cb11ceab06b2d7':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-04 20:23:45 +00:00
Dianne Hackborn
3c8a439be3 am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev 
* commit 'e6333e5188fd4becf7dea286c768f55c3b89d63e':
  Fix issue #17948584: Application crash and phone restart when app...
 2014-12-04 20:23:25 +00:00
Alan Viverette
979ed5140b am 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev 
* commit '3977137d865637297b4723ec8784d5b97fc316dc':
  Slightly more button elevation to match Material spec
 2014-12-04 20:23:18 +00:00
Dianne Hackborn
11bee890a2 am 4c4e4686: am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev 
* commit '4c4e4686d5de3f22cf4d832c63716d9054b9ad54':
  Fix issue #18607384: Run fstrim after every system update
 2014-12-04 20:23:11 +00:00
Yin-Chia Yeh
e168dd28f8 am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev 
* commit '871571ae0c4d8f334265b99e274892346756d51b':
  Camera: update antibanding spec
 2014-12-04 20:23:00 +00:00
Craig Mautner
0dd02334f4 am b3c60bcb: am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed" 
* commit 'b3c60bcb51821116a301a30566b89878ab77d3d0':
  Prevent ANR when broadcast receiver is killed
 2014-12-04 19:59:15 +00:00
Chih-hung Hsieh
f597aae090 am e762f986: am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 
* commit 'e762f986c47caf90a4c5e2887ab41818a1c4599e':
  Add -Wno-unused-parameter to LOCAL_CFLAGS
 2014-12-04 19:59:09 +00:00
Craig Mautner
b3c60bcb51 am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed" 
* commit '6465980cd88ea4ed0057bf23867fd3ab8e146dfa':
  Prevent ANR when broadcast receiver is killed
 2014-12-04 19:51:23 +00:00
Chih-hung Hsieh
e762f986c4 am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 
* commit '0ebbfaedd7fd843229d289baa69fffd33eab2985':
  Add -Wno-unused-parameter to LOCAL_CFLAGS
 2014-12-04 19:51:15 +00:00
Svet Ganov
3ce873349c Merge "Update accessibility event constants in the service registration XML." 2014-12-04 17:24:21 +00:00
Adam Lesinski
63377406f7 am 8e5362f2: am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" 
* commit '8e5362f20e2bc41b1dcf130a613b7e0b3cd1db58':
  RRO: prevent duplicate system overlays
 2014-12-04 16:17:12 +00:00
Michael Wright
8e8a24d793 am c0707c00: am 83de9a42: am da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev 
* commit 'c0707c007d8322338e9f46f5ccb04b5582e75845':
  Add keylayout for Logitech RedHawk Gamepad DO NO MERGE
 2014-12-04 16:16:39 +00:00
Michael Wright
976cf9d838 am fc09908b: (-s ours) am 70d8133c: am 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev 
* commit 'fc09908b8a583b4aa1b0a059e305dc1356ce6aba':
  Added Razer USA, Ltd serval DO NOT MERGE
 2014-12-04 16:16:34 +00:00
Craig Mautner
6465980cd8 am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed" 
* commit 'e879b2ae69bf7ef159dbdc068423526d5db99df0':
  Prevent ANR when broadcast receiver is killed
 2014-12-04 15:16:11 +00:00
Chih-hung Hsieh
0ebbfaedd7 am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 
* commit 'ccce6e0f9f6f4da95d61fb2cfb1253ac662fba30':
  Add -Wno-unused-parameter to LOCAL_CFLAGS
 2014-12-04 15:16:04 +00:00
Yohann Roussel
e1c00320b6 Merge "Allow compilation with Jack." 2014-12-04 09:26:54 +00:00
Adam Lesinski
8e5362f20e am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" 
* commit '503071ae41374a66f61e53e05a91243473db83b9':
  RRO: prevent duplicate system overlays
 2014-12-04 09:21:45 +00:00
Geoff Mendal
48d196b9c5 Merge "Import translations. DO NOT MERGE" 2014-12-04 05:46:30 +00:00
Geoff Mendal
4d69f10d56 Merge "Import translations. DO NOT MERGE" 2014-12-04 05:29:42 +00:00
Geoff Mendal
09a45a2f21 Merge "Import translations. DO NOT MERGE" 2014-12-04 04:43:06 +00:00
Craig Mautner
e879b2ae69 Merge "Prevent ANR when broadcast receiver is killed" 2014-12-04 01:56:39 +00:00
Kenji Sugimoto
4472fa9780 Prevent ANR when broadcast receiver is killed 
If the process of a BroacastReceiver is dying at the same time
as the system is trying to send an ordered broadcast to the
receiver, the system will try to start the process again. The
BroadcastQueue will store the BroadcastRecord in mPendingBroadcast
to be able to handle it again when the process is awake. A
timeout Message is posted to the handler of the BroadcastQueue.

As part of the shutdown sequence skipCurrentReceiver is called for
the ProcessRecord. This will check if there is a curReceiver set
for the application and make sure to finish the receiver.

Each of the foreground and background BroadcastQueues have their
own handler for managing broadcast timeouts. If the wrong
BroadcastQueue finishes the receiver, the pending timeout Message
will never be cancelled, leading to an ANR report for a receiver
that has already been finished.

Change-Id: I960c0d8f1a8b739b54a8f09f496b32a3498b9e9a
 2014-12-03 17:53:06 -08:00
Svet Ganov
fdd2442b62 Update accessibility event constants in the service registration XML. 
An accessibility service may be configured to receive only certain event
types in the meta-data XML file. This change adds some missing event types
to the possible events to register for in the XML. This ensures parity
between the Java API and the XML declaration.

bug:18528776

Change-Id: Ie516f356db81fb1fb39f8d3a61b1edcbba1c7448
 2014-12-04 01:10:47 +00:00
Chih-hung Hsieh
ccce6e0f9f Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" 2014-12-04 01:04:09 +00:00
Robert Greenwalt
98f81182fb am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 
* commit '647b437d0772a8c73ac3936b2f8e69d4bd1953d3':
  Separate voice/data roaming state and type
 2014-12-03 23:00:34 +00:00
Eino-Ville Talvala
6e21817b8e am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 
* commit 'd23f8b44d575dcdc00965aae5fffd97f0336df43':
  Revert "Camera: Add new capability flags as system features as well"
 2014-12-03 23:00:15 +00:00
Robert Greenwalt
647b437d07 Merge "Separate voice/data roaming state and type" into lmp-mr1-dev 2014-12-03 22:18:24 +00:00
Eino-Ville Talvala
d23f8b44d5 Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev 2014-12-03 22:01:42 +00:00
John Spurlock
c676866262 am c9b862cf: am 06eaac44: am cdf7f984: Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev 
* commit 'c9b862cfc4f8061a4528648aaae1a2f55afb4780':
  Doze: Fast path for pickup pulses.
 2014-12-03 21:51:10 +00:00
Sreeram Ramachandran
16d75742fc am 3a8fbb80: am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev 
* commit '3a8fbb8072f564c6da9b7655c1c90b26670d2f12':
  Fix docs per API review.
 2014-12-03 21:51:05 +00:00
Etan Cohen
64d3c1402a am a2ab707c: am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place) 
* commit 'a2ab707c87b8129873078dcea8effdd970de67c3':
  Add a global override for VoLTE calls (which leaves user setting in place)
 2014-12-03 21:51:00 +00:00
Craig Mautner
07b2b9f45d am 62a7022f: am 56f10c26: am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev 
* commit '62a7022f7d831c166d7ffd198556df4a7f106510':
  Handle keyguard dismiss flags correctly
 2014-12-03 21:50:55 +00:00
Trevor Johns
ea28e5fd9d am 8e78f0a7: am 9aa9e46b: am 5244ab68: am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs 
* commit '8e78f0a7122432c4cfabe86ccf46c724297e11b0':
  Docs: Add "admin" to samples categories
 2014-12-03 21:50:50 +00:00
Trevor Johns
4888e3376d am d0dca6f3: am f560f334: am e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit 'd0dca6f3221919a1d3c4daca8c6640aa23a913be':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 21:50:46 +00:00
Trevor Johns
1e24dfb000 am 8db20dc1: am 2047e6a0: am 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '8db20dc19d268d85f52a11ab96091b176b2cf054':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 21:50:41 +00:00
Winson Chung
3b8887d540 am fee5e3d3: am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev 
* commit 'fee5e3d32a26c3ac2136e37cad15fd9cc41066db':
  Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)
 2014-12-03 21:50:36 +00:00
Evan Charlton
f50d111e4f am c0362c5d: am 10dff0a7: am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev 
* commit 'c0362c5da3e5a855ae46210aa9b4223d70513bf2':
  Re-add Connection.getCallCapabilities
 2014-12-03 21:50:32 +00:00
Nancy Chen
ba6f884143 am 5125dc1c: am a1163d57: am 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev 
* commit '5125dc1cbc6e476903a59f84dbe0dac01c3901e0':
  Change a semi-colon to a colon in AudioState logging.
 2014-12-03 21:50:25 +00:00
Paul Jensen
97af72493f am 3249d637: am 3107a9ad: am f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev 
* commit '3249d63704c5cf101c31afc5a345b7f49662323f':
  Retry failed network validation every 10 minutes.
 2014-12-03 21:50:20 +00:00
Adam Lesinski
11cf12ff25 am 455550d5: am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev 
* commit '455550d5869e6ca1433802b06e15d415b6f86e6b':
  AAPT: Add pathMotion custom classes to Proguard Keep set
 2014-12-03 21:50:15 +00:00
Dianne Hackborn
98866d1179 am b46e9da6: am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev 
* commit 'b46e9da64c51bcbfdd21b8e18850064eeb50d930':
  Work on issue #18572506: AppOps in-memory state is invalid after...
 2014-12-03 21:50:10 +00:00
Adrian Roos
e4657d46b6 am bf6f7960: am b67d8ef6: am f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev 
* commit 'bf6f7960f43fe03cd7e0c823263dca58111b8130':
  Refresh user list a little more eagerly
 2014-12-03 21:50:06 +00:00
Svetoslav
b9f2345350 am dc026baf: am 5303451e: am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev 
* commit 'dc026bafa97ad0c2cc2446bfe8ae5992f660ed21':
  Inconsistent media sizes for es-US locale.
 2014-12-03 21:50:01 +00:00