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

173274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
d93597cee1 am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
automerge: 1388342

* commit '1388342c7f6e9c235d31b01edf3716e83fad3e64':
  More debugging for bug 17721767
 2015-01-20 23:56:48 +00:00
Christopher Tate
ebdec3e092 am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev 
automerge: 8192670

* commit '8192670937e3dee8e2c521a9ed1118a5782a2912':
  Don't launch broadcast receiver processes during boot
 2015-01-20 23:55:00 +00:00
Christopher Tate
fb4fde7053 Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev automerge: 14c33f6 
automerge: 78a05de

* commit '78a05de82daffdf746c252b49f12ef88073b0459':
  Don't try to launch broadcast receivers during boot
 2015-01-20 23:52:57 +00:00
Sanket Padawe
f0f5eee823 Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760 
automerge: 76e9d18

* commit '76e9d18055d131bede49886c9c86c9f59db3fac4':
  Fixed a crash in TelephonyManager while calling getDeviceID()
 2015-01-20 23:49:54 +00:00
Jinsuk Kim
00959a56e5 am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev 
automerge: 375ae7b

* commit '375ae7ba3263ee8eceeb371b170e9181c801c612':
  Mark TimeUnit as @SystemApi
 2015-01-20 23:47:44 +00:00
Craig Mautner
1388342c7f am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
* commit '088bf3a37a329962efb5e5a42c82f32a2dab77fe':
  More debugging for bug 17721767
 2015-01-20 23:12:29 +00:00
Christopher Tate
8192670937 am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev 
* commit '77c96dd80ac25f91b226eff70034c1a4e81e593b':
  Don't launch broadcast receiver processes during boot
 2015-01-20 23:12:24 +00:00
Christopher Tate
78a05de82d Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev 
automerge: 14c33f6

* commit '14c33f6a716f224d1bc821cd8aa062f5734c29bf':
  Don't try to launch broadcast receivers during boot
 2015-01-20 23:02:23 +00:00
Sanket Padawe
76e9d18055 Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev 
automerge: e54e760

* commit 'e54e760477b95aa0396c3abb2b7452410782b147':
  Fixed a crash in TelephonyManager while calling getDeviceID()
 2015-01-20 22:58:29 +00:00
Craig Mautner
088bf3a37a Merge "More debugging for bug 17721767" into lmp-mr1-dev 2015-01-20 22:57:42 +00:00
Christopher Tate
77c96dd80a Merge "Don't launch broadcast receiver processes during boot" into lmp-mr1-dev 2015-01-20 22:55:16 +00:00
Christopher Tate
14c33f6a71 Merge "Don't try to launch broadcast receivers during boot" into lmp-mr1-dev 2015-01-20 22:54:53 +00:00
Sanket Padawe
e54e760477 Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev 2015-01-20 22:50:03 +00:00
Craig Mautner
6673d09a8a Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev automerge: d9a79b5 
automerge: 03d7cc3

* commit '03d7cc3c24e7d89d82394c9d0cfc8e0c3423687f':
  Remove debugging and skip InputMethod windows
 2015-01-20 22:45:50 +00:00
Jinsuk Kim
375ae7ba32 am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev 
* commit '054f2656a17a438aa6e8c8f6dcd61b1217f41b88':
  Mark TimeUnit as @SystemApi
 2015-01-20 22:43:34 +00:00
Craig Mautner
a3342991a7 am cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 
automerge: 07317da

* commit '07317da6834cc35fe8fad519bb60f15ba68bcd48':
  Do not defer removal for empty tasks or activities
 2015-01-20 22:43:32 +00:00
Sanket Padawe
201cc00947 Fixed a crash in TelephonyManager while calling getDeviceID() 
Bug: 19056848
Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f
 2015-01-20 14:40:14 -08:00
Jinsuk Kim
054f2656a1 Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev 2015-01-20 22:39:53 +00:00
Craig Mautner
03d7cc3c24 Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev 
automerge: d9a79b5

* commit 'd9a79b5ba9934429289a634bdd4ad1a375484184':
  Remove debugging and skip InputMethod windows
 2015-01-20 22:35:57 +00:00
Craig Mautner
d9a79b5ba9 Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev 2015-01-20 22:34:01 +00:00
Jinsuk Kim
28d2a693ef Mark TimeUnit as @SystemApi 
Bug: 18960664
Change-Id: If2c1259b312138bad9416b10f14a8af0f1a222f4
 2015-01-21 07:33:40 +09:00
Craig Mautner
07317da683 am cbb286b8: Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 
* commit 'cbb286b8594c56161f2765023a73d8200e426f9b':
  Do not defer removal for empty tasks or activities
 2015-01-20 22:32:16 +00:00
Christopher Tate
0721a94630 Don't try to launch broadcast receivers during boot 
It turns out that sysUI visibility / interactivity is racing with
boot, and it's possible in some circumstances for the user to start
the secure camera swipe gesture before formal boot-completed.  Make
sure we only send the camera-related broadcast to registered
receivers in that case, otherwise we'll implicitly be asking to
launch other apps before boot, which is forbidden.

Bug 19060618

Change-Id: I7fcf13b5af7b2edfbb4aac06ef04a0fde2c6a0f7
 2015-01-20 14:29:22 -08:00
Craig Mautner
cbb286b859 Merge "Do not defer removal for empty tasks or activities" into lmp-mr1-dev 2015-01-20 22:26:11 +00:00
Christopher Tate
267603f3bb Don't launch broadcast receiver processes during boot 
Broadcasts that might be sent before the boot process has completed must
be restricted to registered receivers, at least while still in the
middle of booting.

Bug 19060618

Change-Id: Ib4e0990cf252f34344f7a0bd19a0e72919013e0f
 2015-01-20 14:21:21 -08:00
Ying Wang
43df3c6c19 am b5108949: am e4a031e3: Merge "New trick to install bad dex file." 
* commit 'b51089499c8c39fce47deccf70d3ea069c58b471':
  New trick to install bad dex file.
 2015-01-20 22:01:26 +00:00
Craig Mautner
0c4d81cf13 Do not defer removal for empty tasks or activities 
It is possible for empty activities to be leaked if their last
window is removed before animations finish. This change keeps tasks
and activities from having removal deferred if they have no windows.

Fixes bug 19047432

Change-Id: If6562f46bbfcac9ba987e2c834a1d55a9a8f3766
 2015-01-20 13:57:27 -08:00
Adam Lesinski
d9bd08864e am aee7225e: Merge "Process base APK" into lmp-mr1-dev 
automerge: 554a6f5

* commit '554a6f5278ec05077d8252249afc911897fbfe76':
  Process base APK
 2015-01-20 21:55:12 +00:00
Ying Wang
b51089499c am e4a031e3: Merge "New trick to install bad dex file." 
* commit 'e4a031e3c3b234ff91ce62e95b788eca7e00082c':
  New trick to install bad dex file.
 2015-01-20 21:50:14 +00:00
Adam Lesinski
554a6f5278 am aee7225e: Merge "Process base APK" into lmp-mr1-dev 
* commit 'aee7225e34376a90e8c25e5df53604085cc1b712':
  Process base APK
 2015-01-20 21:48:03 +00:00
Christopher Tate
a9c122af60 Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev automerge: 7651dcb 
automerge: 5afc62c

* commit '5afc62cd39403c12a253101b12c52f440843bdaf':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:45:08 +00:00
Ying Wang
e4a031e3c3 Merge "New trick to install bad dex file." 2015-01-20 21:43:52 +00:00
Adam Lesinski
aee7225e34 Merge "Process base APK" into lmp-mr1-dev 2015-01-20 21:41:46 +00:00
Christopher Tate
5afc62cd39 Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev 
automerge: 7651dcb

* commit '7651dcb92193a5a970a2554e067ec14d6fcad802':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:26:56 +00:00
Christopher Tate
7651dcb921 Merge "Don't write widget metadata to backup unless it's new/changed" into lmp-mr1-dev 2015-01-20 21:24:00 +00:00
Wale Ogunwale
f5f54dd691 am 92dd1abe: Update restored task uid to match the package uid on current device. 
automerge: 7fd985f

* commit '7fd985f2c69f600f7530311ac9b7c9af196dc0e0':
  Update restored task uid to match the package uid on current device.
 2015-01-20 21:10:01 +00:00
Wale Ogunwale
7fd985f2c6 am 92dd1abe: Update restored task uid to match the package uid on current device. 
* commit '92dd1abef4c0a22db40c5f7bbd100e6b471a1ad3':
  Update restored task uid to match the package uid on current device.
 2015-01-20 20:58:26 +00:00
Wale Ogunwale
92dd1abef4 Update restored task uid to match the package uid on current device. 
The uid on the task we are restoring from another device are
meaningless on the current device. Change updates the uid of any
task we restore to match the package uid on the current device.

Bug: 19014377
Change-Id: I285fbe9f509cae3d2e9a212a59e88f34b4db20e5
 2015-01-20 12:52:07 -08:00
Ying Wang
b643624d2f New trick to install bad dex file. 
Previously we use LOCAL_JAVA_RESOURCE_FILES to override the normally
generated classes.dex with a bad dex file.
Now as we have moved Java resource processing before running jarjar, dx
would fail for the bad classes.dex inside the classes.jar.
Instead we override the target specific variable PRIVATE_DEX_FILE to
inject the bad dex file.

(cherry-picked from commit f122d90c290c789e0d0085127beebdcf1935c127)

Bug: 18837479
Change-Id: I73f82c8a15e1d8935d9c2f290ba9456184a56ec7
 2015-01-20 12:15:17 -08:00
Ricardo Cervera
115759a389 am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c 
automerge: 046dc08

* commit '046dc08962fcf0ea32597859c3ef80afea0d4069':
 2015-01-20 19:07:11 +00:00
Craig Mautner
94ab46659b More debugging for bug 17721767 
Narrow down why GEL is being resumed instead of the top stack.

Change-Id: I79c0be4adf0ccee30e1a5aa4308ee91148f239fa
 2015-01-20 10:52:53 -08:00
Ricardo Cervera
046dc08962 am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c 
* commit '7c002d75b62585c3598a4a5a93647a3323e90b8d':
 2015-01-20 18:38:40 +00:00
Ricardo Cervera
7c002d75b6 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 
automerge: 47e274c

* commit '47e274c56a0662e3e2aef24f2a458cc078e70fd8':
 2015-01-20 18:32:22 +00:00
Ricardo Cervera
47e274c56a am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 
automerge: 458f432

* commit '458f4326bdff638cefe175b179a487872cf678c1':
 2015-01-20 18:10:49 +00:00
Ricardo Cervera
458f4326bd am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 
automerge: eada048

* commit 'eada048addc14a95ced54b17c6a75f5f899e2c2a':
 2015-01-20 18:03:50 +00:00
Ricardo Cervera
eada048add am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
automerge: e8f6bd4

* commit 'e8f6bd484627e16fa2fd9509b0f06056ee44be94':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-20 17:57:45 +00:00
Neil Fuller
77e7f40116 am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build." 
* commit 'aa3a45ba5bc78ab4015a1d2c4c361d3f54118d8e':
  Fix for broken docs build.
 2015-01-20 15:29:55 +00:00
Neil Fuller
aa3a45ba5b am 42c2ac00: Merge "Fix for broken docs build." 
* commit '42c2ac00e6e6e8fcfd15dcfbc6d70eabc709d904':
  Fix for broken docs build.
 2015-01-20 15:24:35 +00:00
Neil Fuller
42c2ac00e6 Merge "Fix for broken docs build." 2015-01-20 15:18:59 +00:00
Neil Fuller
ae69120b0f Fix for broken docs build. 
Broken by commit 50a01d89606b40dd151ad407d05c3b2867bbdbad

Change-Id: Iab460aa6254d320349f67e747f763bbf06d3e9e7
 2015-01-20 15:17:04 +00:00