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

176887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
ebc9f2e773 Update locally cached drawables when constant state changes 
Previously we were failing to update references to drawables that had
been pulled from constant state, so we were drawing the wrong ones.

Also fixes button Z translation on press, which was WAY too high.

BUG: 18542282
Change-Id: Ifde7d64e31d31737854cfcbe75777e5b07a06e3a
 2014-12-04 12:54:46 -08:00
Joe Fernandez
709df4fa26 Merge "docs: Fixes for App Indexing training class" into lmp-docs 2014-12-04 20:50:49 +00:00
Joe Fernandez
71d58705d8 docs: Fixes for App Indexing training class 
b/18244320
b/17982146

Change-Id: Ic095c3c73d09fa2d7f3c08fa47763fa8589683af
 2014-12-04 12:49:45 -08:00
Geoff Mendal
afda110a48 am 348b03bf: (-s ours) am 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '348b03bff44482a3cd004f0aec9b66b721a3b62e':
  Import translations. DO NOT MERGE
 2014-12-04 20:45:16 +00:00
Geoff Mendal
41398aa48a am a79eea5c: (-s ours) am 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'a79eea5c9722d1ee23c7b220f4c29815a1c6c0bd':
  Import translations. DO NOT MERGE
 2014-12-04 20:45:12 +00:00
Geoff Mendal
a0e6d49c3b am a786837b: (-s ours) am 2253b8c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'a786837be8181cfb251e695a8df8a0409dd1b4aa':
  Import translations. DO NOT MERGE
 2014-12-04 20:45:08 +00:00
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
Wale Ogunwale
18795a2299 Add support from restoring recent's backup. 
Bug: 15986349
Change-Id: I899f81d317fcd5277a75db7ba50ecca14112df26
 2014-12-04 12:37:53 -08:00
David Friedman
753f4fc951 am 9c28ba76: am 47eddc7c: am bf6a4bfb: am 6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs 
* commit '9c28ba76f6865b3531b38e1d7f9be258571e9c2d':
  Change notes for NDK r10d, to publish to DAC
 2014-12-04 20:37:08 +00:00
Geoff Mendal
135a576185 am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '597a75318e22ebebf9338f5dfc7d7c99aa3f23a2':
  Import translations. DO NOT MERGE
 2014-12-04 20:37:03 +00:00
David Friedman
29b0400192 am 17904f8b: am 2d2e7bf3: am ed839a76: am 795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug 18553334" into lmp-docs 
* commit '17904f8b9c7553601d4ec1b24356c43cb80c318f':
  Fixes a typo, in which the word "give" is repeated. Bug 18553334
 2014-12-04 20:36:58 +00:00
Svetoslav
8d9a06feee am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev 
* commit '6e7bf935b4adbfcc75c968f030f770af87bf6dbb':
  Notify accessibility for window changes after an app animation end.
 2014-12-04 20:36:52 +00:00
David Friedman
9c28ba76f6 am 47eddc7c: am bf6a4bfb: am 6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs 
* commit '47eddc7cc98cb99b5820c07109337a1f5ea48c77':
  Change notes for NDK r10d, to publish to DAC
 2014-12-04 20:31:32 +00:00
Geoff Mendal
597a75318e am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '9ece2e960046a169ac30c4b23119052793c76d98':
  Import translations. DO NOT MERGE
 2014-12-04 20:31:29 +00:00
David Friedman
17904f8b9c am 2d2e7bf3: am ed839a76: am 795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug 18553334" into lmp-docs 
* commit '2d2e7bf33f2e443a650fa29ee646055b231ea380':
  Fixes a typo, in which the word "give" is repeated. Bug 18553334
 2014-12-04 20:30:57 +00:00
Svetoslav
6e7bf935b4 Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev 2014-12-04 20:29:57 +00:00
Guobin Zhang
53964dac4b ANR caused by incorrect cleanup in BroadcastQueue. 
Pulled from aosp.

Fixes bug 18593454.

Two broadcasts could be sent to the same app simultaneously:
one foreground, one background. For example, LOCALE_CHANGED
and PACKAGE_CHANGED are delievered to com.android.vending
at the same time.
1. AMS started new vending process to handle LOCALE_CHANGED.
   And set app.curReceiver = LOCALE_CHANGED.
2. Before LOCALE_CHANGED is handled by vending process,
   PACKAGE_CHANGED was delievered to vending process too.
   AMS set app.curReceiver = PACKAGE_CHANGED. Bad!
3. Vending process finished handling LOCALE_CHANGED.
   AMS clear app.curReceiver = NULL. Bad!
   And Vending process  killed itself without handling
   PACKAGE_CHANGED.
4. AMS known vending process has died, but didn't know that
   BgBroadcastQueue was still waiting for finish message
   for PACKAGE_CHANGED.
At last, BgBroadcastQueue reported ANR for PACKAGE_CHANGED.

This patch adds protection before clearing app.curReceiver,
only set to NULL if the finishing receiver = app.curReceiver
So handleAppDied would know that PACKAGE_CHANGED was not
finished yet, it will abort the broadcast and continue.

Change-Id: Ic4f31b35e21823d4a3c27712391ecbede213a494
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
 2014-12-04 12:26:53 -08:00
Geoff Mendal
348b03bff4 am 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '2dadff70d46dd13ba2e51e8ecd5601c6f2f602d3':
  Import translations. DO NOT MERGE
 2014-12-04 20:24:28 +00:00
Geoff Mendal
a79eea5c97 am 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '3b05d2bd6fe7a674537dc87aade5673746c96780':
  Import translations. DO NOT MERGE
 2014-12-04 20:24:11 +00:00
Geoff Mendal
a786837be8 am 2253b8c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '2253b8c576182256139a9b18195aef451f7e134a':
  Import translations. DO NOT MERGE
 2014-12-04 20:24:01 +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
Justin Harrison
2b236ab30e am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev 
* commit '70941f203c13bbd475f2434b69155123cf5ae863':
  Revert "Revert "Improve fling physics for recents""
 2014-12-04 20:10:32 +00:00
Justin Harrison
70941f203c Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev 2014-12-04 20:05:41 +00:00
Justin Harrison
31d9837284 Revert "Revert "Improve fling physics for recents"" 
This is now BC-triaged, so reverting the revert.

This reverts commit 3f7dac5a1ccf5d464070c1a067d1d50741bdbd0e.

Change-Id: Iae9ffc74a44918a83d9cd4dfb7011810c770e135
 2014-12-04 20:05:21 +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
8432cee04f am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev 
* commit '224904e01a2efb01c6276eb64fba531a3d30a42b':
  Prevent ANR when broadcast receiver is killed
 2014-12-04 19:52:21 +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
Craig Mautner
224904e01a Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev 2014-12-04 19:46:20 +00:00
Paul Jensen
461e73677d am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 
* commit 'efb81b9e965c4ba782151b6767e7e3df4f2cdfd2':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2014-12-04 19:33:08 +00:00
Paul Jensen
efb81b9e96 Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 2014-12-04 19:27:52 +00:00
Prerepa Viswanadham
e21aafab0d am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user 
* commit 'ff5e5db319785d23d672af95ac2dff3f37827cfd':
  Fix BT crash due to unset value for BluetoothGattDescriptor from API user
 2014-12-04 19:25:02 +00:00
Luan Nguyen
0e597e9224 am 9b5de582: am daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs 
* commit '9b5de582058d73fbc363028eae061979b6a093ee':
  docs: Update MessageAPI notes to mention the unreliable transmission nature.
 2014-12-04 19:02:50 +00:00
Kenji Sugimoto
d088027ff1 Prevent ANR when broadcast receiver is killed 
Cherry-picked from aosp

Fixes bug 18613138.

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-04 11:02:36 -08:00
Luan Nguyen
9b5de58205 am daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs 
* commit 'daab7426b254b57820f3e556960e9f5b20ba5bc6':
  docs: Update MessageAPI notes to mention the unreliable transmission nature.
 2014-12-04 18:55:08 +00:00
Luan Nguyen
daab7426b2 Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs 2014-12-04 18:50:44 +00:00
Adam Lesinski
0953ab2764 am 720beef2: Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev 
* commit '720beef28dacc924d77576f63fced84e6a820dc6':
  AAPT: Move private attrs to new type for framework
 2014-12-04 18:30:25 +00:00
Prerepa Viswanadham
ff5e5db319 Fix BT crash due to unset value for BluetoothGattDescriptor from API user 
Validate writeDescriptor and writeCharacteristic methods at API invocation
for non null initialisation.

Bug 18395071

Change-Id: I411a57b77981310d8db1f98c67e03b4327c93339
 2014-12-04 18:30:03 +00:00
Adam Lesinski
720beef28d Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-dev 2014-12-04 18:24:41 +00:00