Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,362 Commits 3 Branches 0 Tags
66d065a6d48cafe390c697c77b44ba5196ee0870
Commit Graph

33674 Commits

Author SHA1 Message Date
Zhijun He
66d065a6d4 Camera2: update captureIntent and flash mode tag spec 
Change-Id: Icf32f8643f7dbe4da98bed2d5a22298af7b58d26
 2014-01-16 18:18:50 -08:00
Zhijun He
228f4f92e7 Camera2: Update 3A state doc 
Change-Id: Id484bdff38af34ad2c8b64863d036ff81124401e
 2014-01-16 17:22:05 -08:00
Eino-Ville Talvala
77c3c99833 Merge "Camera2: Sort metadata @see to make it stable over time" 2014-01-17 00:29:04 +00:00
Eino-Ville Talvala
265b34ce33 Camera2: Sort metadata @see to make it stable over time 
Bug: 12591820
Change-Id: Idcfd7acd6f9426162ccf0e51fcfdba9f646d4cc0
 2014-01-17 00:24:14 +00:00
Alan Viverette
bdbb065a1d Merge "Explicit documentation for View.getTag() return value when not set" 2014-01-17 00:06:16 +00:00
Alan Viverette
5bd2c855af Explicit documentation for View.getTag() return value when not set 
Change-Id: I143d445b0c801ffabe04f0042e559594e52d07ed
 2014-01-16 15:55:25 -08:00
Zhijun He
5f2a47f3de Camera2: update metadata specs 
Change-Id: I0f2db931f923af6de281f1404142301d9cfe18ea
 2014-01-16 15:44:41 -08:00
Jeff Sharkey
a17059b787 Merge "Run finalizers before counting for StrictMode." 2014-01-16 23:15:17 +00:00
Doug Zongker
3b0218b0ae boot into recovery via the pre-recovery service 
Change PowerManagerService to start the pre-recovery service rather
than rebooting directly, when requested to reboot into recovery.  Add
a new RECOVERY permission which a caller needs (in addition to REBOOT)
in order to go to recovery.

Bug: 12188746
Change-Id: I39121b701c4724558fe751adfbad79f8567faa43
 2014-01-16 12:54:59 -08:00
Jeff Sharkey
6f3a38f3af Run finalizers before counting for StrictMode. 
Otherwise we sometimes end up counting objects strongly referenced
by the finalizer queue, and falsely detecting an instance leak.

Bug: 12533002
Change-Id: I144c941a3dfb0cbb837b98e80d2f49ffc9ca13c7
 2014-01-16 12:46:43 -08:00
Jeff Brown
09d30981f8 resolved conflicts for merge of 6f357d32 to master 
Change-Id: I1979e6ed1acddbe656f5010114fd900f10865e75
 2014-01-16 11:44:20 -08:00
Jeff Brown
6f357d3284 Start untangling system server early bootstrapping. 
Refactored SystemServer to get rid of a bunch of legacy cruft related
to how the ServerThread used to be started up.

Create system context first when system server starts.  This removes
the tangled initialization order dependency that forced us to start
the activity manager service before most anything else.

Moved factory test related constants into the FactoryTest class.

Partially migrated Installer, ActivityManagerService, and
PowerManagerService to the new SystemService pattern.  There's more
work to be done here, particularly around the lifecycle of the
power manager.

Bug: 12172368
Change-Id: Ia527dd56e3b3fd90f9eeb41289dbe044921230d4
 2014-01-16 11:24:58 -08:00
Alan Viverette
3abc47acf8 Merge "Update smoothScrollToPosition to move faster for large offsets" 2014-01-16 19:13:32 +00:00
Victoria Lease
3d4c3aca86 Merge "check for null mEditor in TextView.canCopy()" 2014-01-16 16:31:33 +00:00
Narayan Kamath
ab8643452a Track AArch64 changes from AOSP. 
mPtr is now long, not int.

Change-Id: I75297cbef3571f8f0cc02a35a06c1bc1f4fbe416
 2014-01-16 16:01:22 +00:00
Narayan Kamath
103d34d3bb am 23b7e0a3: am d8facb67: am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes" 
* commit '23b7e0a32bee5234ef65fccfef1596659a08b630':
  AArch64: Use long for pointers in view/input classes
 2014-01-16 15:58:10 +00:00
Narayan Kamath
5875c94c59 am 275586aa: am 7471dfc4: am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue" 
* commit '275586aa53889a851e0b739e408896861d76e3a8':
  AArch64: Use long for pointers in android/os/MessageQueue
 2014-01-16 15:58:04 +00:00
Narayan Kamath
6606d16e09 am 6706888e: am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68 
* commit '6706888e24aee04c2c914c44e5ef5b1510cf8013':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset
 2014-01-16 15:57:47 +00:00
Narayan Kamath
a3340da7d4 am e18f0e2a: am 19bd2c28: am ab220dee: am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class" 
* commit 'e18f0e2a463374502c0236a0d54909d980bf1043':
  AArch64: Use long for pointers in MotionEvent class
 2014-01-16 15:57:41 +00:00
Narayan Kamath
a98bf2017e am e413dae8: am 8e96d73a: am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class" 
* commit 'e413dae8926f45e08e93dd9454f3b683514f3106':
  AArch64: Use long for pointers in VelocityTracker class
 2014-01-16 15:57:36 +00:00
Narayan Kamath
1bf3ab08db am c45068e4: am d7a54c65: am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile" 
* commit 'c45068e4a48053447413783e549be7273e38ea97':
  AArch64: Use long for pointers in android/os/MemoryFile
 2014-01-16 15:57:29 +00:00
Narayan Kamath
d4513aea25 am a5a0d384: am 425b08f1: am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class" 
* commit 'a5a0d384fce9e9475c1414f69cb47bf6b5259a4d':
  AArch64: Use long for pointers in KeyCharacterMap class
 2014-01-16 15:57:23 +00:00
Elliott Hughes
e974f9b359 am 8bb8caa2: am c12410f1: am c3be4ba3: am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes" 
* commit '8bb8caa2b1c38bdc273082b710e2d089889aea5a':
  AArch64: Use long for pointers in speech/srec classes
 2014-01-16 15:47:19 +00:00
Narayan Kamath
23b7e0a32b am d8facb67: am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes" 
* commit 'd8facb6763638178bd12f1010466e426c0754f49':
  AArch64: Use long for pointers in view/input classes
 2014-01-16 15:42:14 +00:00
Narayan Kamath
275586aa53 am 7471dfc4: am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue" 
* commit '7471dfc4a894ade4cd83949d2b59b9b7e75bbf92':
  AArch64: Use long for pointers in android/os/MessageQueue
 2014-01-16 15:42:09 +00:00
Narayan Kamath
6706888e24 am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68 
* commit '775667c070f6e0375e7a247d30a34b0073d7fd5b':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset
 2014-01-16 15:41:52 +00:00
Narayan Kamath
e18f0e2a46 am 19bd2c28: am ab220dee: am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class" 
* commit '19bd2c28f9c3e4db12cad93ed2a69c17c95e42fd':
  AArch64: Use long for pointers in MotionEvent class
 2014-01-16 15:41:47 +00:00
Narayan Kamath
e413dae892 am 8e96d73a: am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class" 
* commit '8e96d73a755348b25ceb80f907eae15be2da0d75':
  AArch64: Use long for pointers in VelocityTracker class
 2014-01-16 15:41:41 +00:00
Narayan Kamath
c45068e4a4 am d7a54c65: am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile" 
* commit 'd7a54c6574c3ca759e977f27912caecb6b40e827':
  AArch64: Use long for pointers in android/os/MemoryFile
 2014-01-16 15:41:35 +00:00
Narayan Kamath
a5a0d384fc am 425b08f1: am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class" 
* commit '425b08f14419a1e67a3d9d2c9b97ea61ecd4f5cb':
  AArch64: Use long for pointers in KeyCharacterMap class
 2014-01-16 15:41:30 +00:00
Elliott Hughes
8bb8caa2b1 am c12410f1: am c3be4ba3: am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes" 
* commit 'c12410f1a3b951126a02ad5fe4160bc830a860ec':
  AArch64: Use long for pointers in speech/srec classes
 2014-01-16 15:41:18 +00:00
Narayan Kamath
d8facb6763 am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes" 
* commit 'd569e21dac38fffe0e6a7f935e9a6965495b87d4':
  AArch64: Use long for pointers in view/input classes
 2014-01-16 15:38:34 +00:00
Narayan Kamath
7471dfc4a8 am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue" 
* commit '42defa02337b94d25714fe737f749f2c3300c790':
  AArch64: Use long for pointers in android/os/MessageQueue
 2014-01-16 15:38:29 +00:00
Narayan Kamath
775667c070 am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68 
* commit '03e8be757d2703d52fad3fd153c6bcf0b13ed1d1':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset
 2014-01-16 15:38:15 +00:00
Narayan Kamath
19bd2c28f9 am ab220dee: am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class" 
* commit 'ab220deeb8a413649335d5ef47d974dfdc3ac5ec':
  AArch64: Use long for pointers in MotionEvent class
 2014-01-16 15:38:10 +00:00
Narayan Kamath
8e96d73a75 am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class" 
* commit 'e488f2c154f089141709279dd93bcd641c85659b':
  AArch64: Use long for pointers in VelocityTracker class
 2014-01-16 15:38:05 +00:00
Narayan Kamath
d7a54c6574 am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile" 
* commit '31f10bb21b24824c5dbf60b420239513f02b9e55':
  AArch64: Use long for pointers in android/os/MemoryFile
 2014-01-16 15:38:00 +00:00
Narayan Kamath
425b08f144 am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class" 
* commit 'c1abb5e3957f6abdd9cea8f2717290a3f130a216':
  AArch64: Use long for pointers in KeyCharacterMap class
 2014-01-16 15:37:55 +00:00
Elliott Hughes
c12410f1a3 am c3be4ba3: am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes" 
* commit 'c3be4ba304196f1624818dce3da43492156b62fe':
  AArch64: Use long for pointers in speech/srec classes
 2014-01-16 15:37:45 +00:00
Narayan Kamath
d569e21dac am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes" 
* commit '48de490c33cac16ed82d753799d7add804f72977':
  AArch64: Use long for pointers in view/input classes
 2014-01-16 07:35:25 -08:00
Narayan Kamath
42defa0233 am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue" 
* commit 'faa62aaca5f4a149f20487d42279fefc7d356428':
  AArch64: Use long for pointers in android/os/MessageQueue
 2014-01-16 07:35:20 -08:00
Narayan Kamath
03e8be757d am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68 
* commit '8796ab7f22d3e9f5b85571e8851851c023416f96':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset
 2014-01-16 07:35:06 -08:00
Narayan Kamath
ab220deeb8 am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class" 
* commit '947d88a0eacafb2e5ec5ce5eaaae8be32ecb9aa9':
  AArch64: Use long for pointers in MotionEvent class
 2014-01-16 07:35:02 -08:00
Narayan Kamath
e488f2c154 am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class" 
* commit 'a0b25d41d556d2c37852b6036aaf6f33b0e8c5a8':
  AArch64: Use long for pointers in VelocityTracker class
 2014-01-16 07:34:57 -08:00
Narayan Kamath
31f10bb21b am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile" 
* commit '80b3dd0d8e333905e9f2a3a844bc524d41df7da2':
  AArch64: Use long for pointers in android/os/MemoryFile
 2014-01-16 07:34:53 -08:00
Narayan Kamath
c1abb5e395 am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class" 
* commit '53321d9990cae810da28b7ae9f6f9b3fe7455020':
  AArch64: Use long for pointers in KeyCharacterMap class
 2014-01-16 07:34:48 -08:00
Elliott Hughes
c3be4ba304 am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes" 
* commit '12377887e3a74a69100071e0a383f6d9a54046c9':
  AArch64: Use long for pointers in speech/srec classes
 2014-01-16 07:34:39 -08:00
Craig Mautner
fc8fa54f80 am e9ddaa0b: Merge "Cleanup after ActivityView" into klp-modular-dev 
* commit 'e9ddaa0b183d979be782a63970929cebd861b7c9':
  Cleanup after ActivityView
 2014-01-16 15:22:15 +00:00
Narayan Kamath
486544f763 Merge "AArch64: Use long for pointers in view/input classes" 2014-01-16 12:12:31 +00:00
Narayan Kamath
84ee7930bb Merge "AArch64: Use long for pointers in android/os/MessageQueue" 2014-01-16 12:12:15 +00:00