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

187703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chien-Yu Chen
06fe59bfa2 Merge "camera2: add reprocess format map" 2015-04-08 20:42:44 +00:00
Svetoslav
cd890311fb Merge "Apps can request permissions only on platforms that have runtime permissions." 2015-04-08 19:28:02 +00:00
Quddus Chong
4a07dcadf8 am 163e5016: am ff5e9554: am 67f0c8db: am a147451a: am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into 
* commit '163e501609c8f17c1ab20b78c3d5d6691abc2bc2':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 19:21:23 +00:00
Timothy Knight
181767329b Merge "Revert "Camera2: Add camera pose and distortion fields"" 2015-04-08 19:14:38 +00:00
Timothy Knight
fb48944298 Revert "Camera2: Add camera pose and distortion fields" 
This reverts commit da1e6411be6d69650d7e8ae42e738f2dbb356777.

Change-Id: Id04cc86cf9740a2a9bf5eb047b633a2abd90f561
 2015-04-08 19:13:43 +00:00
Quddus Chong
163e501609 am ff5e9554: am 67f0c8db: am a147451a: am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit 'ff5e9554cf0a1a2eaf2e353698b91400a3c57f17':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 19:10:47 +00:00
Ben Kwa
6e08dbc366 Merge "Prototype the destination picking." 2015-04-08 19:05:26 +00:00
Santos Cordon
6d5c0ba98c Merge "Add SIM activation constants to TelephonyManager" 2015-04-08 19:01:36 +00:00
Quddus Chong
ff5e9554cf am 67f0c8db: am a147451a: am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit '67f0c8db35be1c43b3f588e3414557749a277e6f':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 18:59:37 +00:00
Zhijun He
b0c98dac3d Merge "ImageReader/Writer: implement opaque format operations" 2015-04-08 18:57:59 +00:00
Ben Kwa
ef3f2620b3 Prototype the destination picking. 
- Add an intent to open a destination picker, and refactor
DocumentsActivity accordingly.
- Modify CopyService to take a destination for the copy, and to use URIs
and PFDs instead of Files and Streams, for better error handling &
cleanup.

Change-Id: I69dc43823a703674dc29d2215e2df23b33ad7882
 2015-04-08 11:55:18 -07:00
Timothy Knight
dfe5ec56f2 Merge "Camera2: Add camera pose and distortion fields" 2015-04-08 18:52:28 +00:00
Quddus Chong
67f0c8db35 am a147451a: am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit 'a147451ab92e29141cd85d5c75a881586d5959df':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 18:48:57 +00:00
Quddus Chong
60a6e09654 am 5985981b: am b49748cf: am 0c5752be: am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 
* commit '5985981ba45b97e381312ba53f191396607b447d':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
 2015-04-08 18:44:02 +00:00
Quddus Chong
a147451ab9 am c61fd055: am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit 'c61fd05581a80bcecf50509acb220ea3e2817e56':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 18:38:47 +00:00
Eino-Ville Talvala
da1e6411be Camera2: Add camera pose and distortion fields 
- android.lens.info.poseRotation
- android.lens.info.poseTranslation
- android.lens.info.intrinsicCalibration
- android.lens.info.radialDistortion

Change-Id: I3f8cf258b600bc58d0743e44aa6c456cd4b8a906
 2015-04-08 18:37:03 +00:00
Quddus Chong
5985981ba4 am b49748cf: am 0c5752be: am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 
* commit 'b49748cfd3a4f87c394307787665c09521faa77d':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
 2015-04-08 18:33:43 +00:00
Quddus Chong
c61fd05581 am ff4c6325: Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 
* commit 'ff4c632592cce177997d63b3ff81c0b2be9cf9bb':
  cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
 2015-04-08 18:27:56 +00:00
Quddus Chong
b49748cfd3 am 0c5752be: am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 
* commit '0c5752be40a9e7ced5be2659965f3c4ba3c3f4eb':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
 2015-04-08 18:23:52 +00:00
Quddus Chong
ff4c632592 Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 2015-04-08 18:16:58 +00:00
Quddus Chong
0c5752be40 am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 
* commit 'c736e8cf41445e7a32721da617d6d7eacd189703':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
 2015-04-08 18:11:55 +00:00
Jorim Jaggi
2a39aef439 Merge "Fix crash when removing draw listener" 2015-04-08 18:11:44 +00:00
Santos Cordon
2aebb3fec3 Add SIM activation constants to TelephonyManager 
Change-Id: I43fe5de4a1137bede4e81f4d51f272ad92dc80d5
 2015-04-08 11:04:01 -07:00
Quddus Chong
0e3547bd44 cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. 
bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e

Change-Id: I48d1e2f8e1f7d94dffac61a274f9c1a2df31a822
 2015-04-08 10:59:27 -07:00
Quddus Chong
c736e8cf41 am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 
* commit 'f0ab39c10b614514ba4a600aa6fd4354253cde73':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
 2015-04-08 17:53:44 +00:00
Jorim Jaggi
74a94059c6 Fix crash when removing draw listener 
The same behavior can be achieved by using a predraw listener, which
can be removed while the callback is called, so it doesn't crash.

Change-Id: I3a7138ba49936159dc95b7758c9603366dcf808c
 2015-04-08 10:47:22 -07:00
Quddus Chong
f0ab39c10b Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 2015-04-08 17:46:21 +00:00
Zhijun He
ce9d6f9c75 ImageReader/Writer: implement opaque format operations 
Implement attach/detach for image reader and writer.

Bug: 19872821
Change-Id: Ib45a054c6be0b56b370fa8d709b47b0298ba5ea7
 2015-04-08 10:39:29 -07:00
Adrian Roos
a323e3f336 Merge "Relabel emergency button" 2015-04-08 16:58:58 +00:00
Adrian Roos
a41d5a7a35 Relabel emergency button 
Bug: 19574098
Change-Id: Iddf96ba2206838712980aea00c9ea304f590c8b3
 2015-04-08 18:56:38 +02:00
Olawale Ogunwale
8d86acf6c5 am 81954cf3: am 8ddc3e26: am 393f89f2: Merge "[ActivityManager] Avoid NullPointerException if no crash info" 
* commit '81954cf30816a007186fbf3be375feed5a7936cc':
  [ActivityManager] Avoid NullPointerException if no crash info
 2015-04-08 16:51:01 +00:00
Olawale Ogunwale
81954cf308 am 8ddc3e26: am 393f89f2: Merge "[ActivityManager] Avoid NullPointerException if no crash info" 
* commit '8ddc3e26e6534adc6f0cdc5c8b9e6ddc3fe3dd10':
  [ActivityManager] Avoid NullPointerException if no crash info
 2015-04-08 16:40:24 +00:00
Olawale Ogunwale
8ddc3e26e6 am 393f89f2: Merge "[ActivityManager] Avoid NullPointerException if no crash info" 
* commit '393f89f26df724a3da7a21b28925a21fe5fb253f':
  [ActivityManager] Avoid NullPointerException if no crash info
 2015-04-08 16:28:52 +00:00
Olawale Ogunwale
393f89f26d Merge "[ActivityManager] Avoid NullPointerException if no crash info" 2015-04-08 16:07:44 +00:00
Geoff Mendal
0c43e55d2d Merge "Import translations. DO NOT MERGE" 2015-04-08 15:41:10 +00:00
Benjamin Franz
f63afe7b33 Merge "Allow disabling the lock screen when multiple users are present" 2015-04-08 15:02:43 +00:00
Geoff Mendal
9043002a9d Import translations. DO NOT MERGE 
Change-Id: Id26cdcbd9afee8df2e9f8435383923dcc4d96feb
Auto-generated-cl: translation import
 2015-04-08 07:43:35 -07:00
Chet Haase
81b924fcb6 Merge "Animate ActionBar items" 2015-04-08 14:11:38 +00:00
Tomasz Mikolajewski
3a1b164f65 Merge "Use default theme for StandaloneActivity (DocumentsUI)." 2015-04-08 13:33:13 +00:00
Olawale Ogunwale
219af75bce am ce5bdfea: am 380415b6: am 1bdbce29: Merge "[ActivityManager] Finish the failed-to-pause activity" 
* commit 'ce5bdfea12657c1705d910a47cc48b65abc81723':
  [ActivityManager] Finish the failed-to-pause activity
 2015-04-08 13:30:03 +00:00
Tomasz Mikolajewski
a4583a4d2d Merge "Add StubProvider::isChildDocument()." 2015-04-08 13:28:56 +00:00
Olawale Ogunwale
ce5bdfea12 am 380415b6: am 1bdbce29: Merge "[ActivityManager] Finish the failed-to-pause activity" 
* commit '380415b6431adeb8138bc328a926807b8ae41df9':
  [ActivityManager] Finish the failed-to-pause activity
 2015-04-08 13:19:02 +00:00
Geoff Mendal
8772936e5e Merge "Import translations. DO NOT MERGE" 2015-04-08 13:18:41 +00:00
Geoff Mendal
ec232e3621 Import translations. DO NOT MERGE 
Change-Id: I2e860f32f21ae0449ca98dda3519e4733d2d614e
Auto-generated-cl: translation import
 2015-04-08 06:13:49 -07:00
Olawale Ogunwale
380415b643 am 1bdbce29: Merge "[ActivityManager] Finish the failed-to-pause activity" 
* commit '1bdbce295cd7978e50b5444420ed222ec6c6281c':
  [ActivityManager] Finish the failed-to-pause activity
 2015-04-08 13:09:42 +00:00
Geoff Mendal
f5215056be Merge "Import translations. DO NOT MERGE" 2015-04-08 12:55:20 +00:00
Geoff Mendal
032492572e Import translations. DO NOT MERGE 
Change-Id: Ib75733c03e1a3350e192c9967a0f8b2e4b49e8c2
Auto-generated-cl: translation import
 2015-04-08 05:52:41 -07:00
Olawale Ogunwale
1bdbce295c Merge "[ActivityManager] Finish the failed-to-pause activity" 2015-04-08 12:51:12 +00:00
Geoff Mendal
3ebbdd03ea Import translations. DO NOT MERGE 
Change-Id: I0f9b0b3036a149b304b874fbaa2d95cf56e4e816
Auto-generated-cl: translation import
 2015-04-08 05:35:59 -07:00
Tomasz Mikolajewski
86213c9486 Use default theme for StandaloneActivity (DocumentsUI). 
Change-Id: I41841702e0b68123cb73ff1203ca6e6fe5eae320
 2015-04-08 20:35:33 +09:00