Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,107 Commits 3 Branches 0 Tags
f415d8243d729a84d024d4868bfb7d60d5f28150
Commit Graph

41115 Commits

Author SHA1 Message Date
Michael Wright
f415d8243d am 798d3953: am 58f5f69b: am e252525f: Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 
* commit '798d39533c258411e0c879961c7c54a76bbb99bc':
  Add extra to ASSIST intent to indicate potential input type
 2014-09-05 20:32:12 +00:00
Michael Wright
215e31e6ca am 58f5f69b: am e252525f: Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 
* commit '58f5f69b7763fa846cfa58ec945f2ad6600ed031':
  Add extra to ASSIST intent to indicate potential input type
 2014-09-05 20:21:05 +00:00
Michael Wright
57b4ad9f5a Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 2014-09-05 19:36:47 +00:00
Ruben Brunk
afd5b0a80e am da644495: am bb02db9f: am eb08250a: Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev 
* commit 'da644495ead7405970100415ef7dc86dd1ad7567':
  camera2: Undo mirror for front camera in legacy mode.
 2014-09-05 19:21:36 +00:00
Wei Wang
b451e9374a am e5554ef6: am 368a0cb9: am 294383cc: Merge "Unregister app when advertise failed after registration." into lmp-dev 
* commit 'e5554ef69c57984626be06236ada7d3fb83a8b37':
  Unregister app when advertise failed after registration.
 2014-09-05 19:21:31 +00:00
Ruben Brunk
0ae884a051 am bb02db9f: am eb08250a: Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev 
* commit 'bb02db9fa368fc0c630acba16eb59af9fbd46729':
  camera2: Undo mirror for front camera in legacy mode.
 2014-09-05 19:10:42 +00:00
Wei Wang
69b4a9cd53 am 368a0cb9: am 294383cc: Merge "Unregister app when advertise failed after registration." into lmp-dev 
* commit '368a0cb949d4cd57dfa64f46211320ecd8f964a8':
  Unregister app when advertise failed after registration.
 2014-09-05 19:10:36 +00:00
Svetoslav
0497ebed94 am 084a748c: am 590f0f34: am b1d65d18: Merge "Fix runtime restart" into lmp-dev 
* commit '084a748cdfb8707bf5a28af4123a62a316a14ce1':
  Fix runtime restart
 2014-09-05 19:00:25 +00:00
Ruben Brunk
8eca9e0f0b Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev 2014-09-05 18:52:54 +00:00
Wei Wang
6550557f99 Merge "Unregister app when advertise failed after registration." into lmp-dev 2014-09-05 18:49:27 +00:00
Svetoslav
c420140874 am 590f0f34: am b1d65d18: Merge "Fix runtime restart" into lmp-dev 
* commit '590f0f345077cb40068e86db5a30185d454b7734':
  Fix runtime restart
 2014-09-05 18:48:47 +00:00
Svetoslav
df11867be3 Merge "Fix runtime restart" into lmp-dev 2014-09-05 18:30:42 +00:00
Svetoslav
7de2abb16c Fix runtime restart 
Change-Id: Ic50c8b3b06603ad517fdc8a2392ad12318d46817
 2014-09-05 11:28:00 -07:00
Jeff Sharkey
cb1919278e am d64f08ff: am 27264229: am a32e4e6b: Merge "Allow badging updates to install sessions." into lmp-dev 
* commit 'd64f08ff18f7943890b2940b178313e8c00ae410':
  Allow badging updates to install sessions.
 2014-09-05 18:22:23 +00:00
Eino-Ville Talvala
91d0d9ab0e am 4b037548: am 51c48521: am f62fb8f9: Merge "Camera2: Document supported target combinations for a session." into lmp-dev 
* commit '4b037548e61fe6e90b616839ef8e416fdb1eb322':
  Camera2: Document supported target combinations for a session.
 2014-09-05 18:22:17 +00:00
Chris Craik
b73b8e8f35 am a432b4d0: am 12902a44: am 8ff3e227: Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev 
* commit 'a432b4d090789d420f0beae177b257b56e331ed0':
  Replace native crash with IAE when calling picture.draw() w/ a HW canvas
 2014-09-05 18:22:12 +00:00
Jeff Sharkey
11d4400318 am 27264229: am a32e4e6b: Merge "Allow badging updates to install sessions." into lmp-dev 
* commit '27264229839c03a5530250b7e93de49694fed235':
  Allow badging updates to install sessions.
 2014-09-05 18:10:14 +00:00
Eino-Ville Talvala
9e6dd8d9ef am 51c48521: am f62fb8f9: Merge "Camera2: Document supported target combinations for a session." into lmp-dev 
* commit '51c485212506ca8d4b99c12cd72cffb2b1298847':
  Camera2: Document supported target combinations for a session.
 2014-09-05 18:09:57 +00:00
Chris Craik
aab1c9bfec am 12902a44: am 8ff3e227: Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev 
* commit '12902a4442cb985e9494d944a7d7e9921e561fa1':
  Replace native crash with IAE when calling picture.draw() w/ a HW canvas
 2014-09-05 18:09:52 +00:00
Jeff Sharkey
43a2d06166 Merge "Allow badging updates to install sessions." into lmp-dev 2014-09-05 17:56:39 +00:00
Eino-Ville Talvala
48980da14d Merge "Camera2: Document supported target combinations for a session." into lmp-dev 2014-09-05 17:54:01 +00:00
George Mount
9ee0ca2744 am 4b97ca76: am a0031cbc: am 1377fe31: Merge "API Review: Improve javadoc." into lmp-dev 
* commit '4b97ca7682cde8eeec281efd488189b46ca4c986':
  API Review: Improve javadoc.
 2014-09-05 17:52:27 +00:00
Chris Craik
def8a37128 Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev 2014-09-05 17:49:20 +00:00
George Mount
c66e35b889 am a0031cbc: am 1377fe31: Merge "API Review: Improve javadoc." into lmp-dev 
* commit 'a0031cbcfe2329cdc1c2834a9817ac5c2725a34f':
  API Review: Improve javadoc.
 2014-09-05 17:42:20 +00:00
Svetoslav
de5684b5a7 am 35c2aca2: am 1d85c1a4: am 4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev 
* commit '35c2aca25a56efc9479f03094052f16cf7f94219':
  Update FrameStats API per api-council request.
 2014-09-05 17:35:27 +00:00
Svetoslav
13daae1862 am 170ace43: am 35952bf0: am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev 
* commit '170ace439d91cb86f7b5b6f8129d44e2e5c40d61':
  Addressing API council comments for UserManager.
 2014-09-05 17:35:22 +00:00
Amith Yamasani
ae76e4c99c am e6f95718: am 0acac4f5: am 3c0a511d: Merge "Remove class that was moved to a different package." into lmp-dev 
* commit 'e6f95718f30720ec9ef02f326b21c7499aae476e':
  Remove class that was moved to a different package.
 2014-09-05 17:35:13 +00:00
Chris Craik
96890564bd Replace native crash with IAE when calling picture.draw() w/ a HW canvas 
bug:17397958
Change-Id: I75f942db0e604f9fd6ab31e6c81f718c0f57b16a
 2014-09-05 10:33:39 -07:00
George Mount
0ff16cf43a Merge "API Review: Improve javadoc." into lmp-dev 2014-09-05 17:29:29 +00:00
George Mount
f9557619a7 API Review: Improve javadoc. 
Bug 17189781
Also rename PatternMotion to PatternPathMotion

Change-Id: I1c4dcbdd65e33cf9de1504277e31f9f7ede0380d
 2014-09-05 10:27:27 -07:00
Svetoslav
7b9d7bc1d4 am 1d85c1a4: am 4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev 
* commit '1d85c1a4d3cf65a22907c5cb7f47f1e8765df832':
  Update FrameStats API per api-council request.
 2014-09-05 17:24:39 +00:00
Svetoslav
79391c3c5d am 35952bf0: am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev 
* commit '35952bf0e8fd0ace78b015c3cde29b322cd939bb':
  Addressing API council comments for UserManager.
 2014-09-05 17:24:34 +00:00
Amith Yamasani
d48509d568 am 0acac4f5: am 3c0a511d: Merge "Remove class that was moved to a different package." into lmp-dev 
* commit '0acac4f509db1bca7fece43550da8a0d558cfb9d':
  Remove class that was moved to a different package.
 2014-09-05 17:24:24 +00:00
Jeff Sharkey
199f51ce30 am be5a66f7: am b4733a8d: am e7bea8e5: Merge "Move Size parceling to Bundle." into lmp-dev 
* commit 'be5a66f706fdffe5eb0e9e744b94a5cd73d58e4a':
  Move Size parceling to Bundle.
 2014-09-05 17:19:40 +00:00
Amith Yamasani
7fd339a2be am 86acf269: am 90f3b5ad: am 0c3b7b15: Merge "Don\'t allow guests to install from unknown sources" into lmp-dev 
* commit '86acf269215992eb4d79eef9cad58986fd42dac4':
  Don't allow guests to install from unknown sources
 2014-09-05 17:19:30 +00:00
Robert Greenwalt
683aba53f8 am 9d869562: am b6b07686: am a155ef81: Merge "Fix networking API per scripting checks." into lmp-dev 
* commit '9d869562cbcb9cabcba58320fdc3f6f5632809a9':
  Fix networking API per scripting checks.
 2014-09-05 17:18:46 +00:00
Dharmesh Mokani
140616a89c am 6feba6b6: am 0b230ea6: am efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev 
* commit '6feba6b61ecddcb93a2b33a2ea52daad6cf70bd5':
  Address API review comment:AlwaysOnHotwordDetector
 2014-09-05 17:18:26 +00:00
Alexandra Gherghina
f32a644580 am 1d42993c: am c0e7e74c: am e27eb3ec: Merge "Rename intent extra following API review" into lmp-dev 
* commit '1d42993c437ff287f0507128ed07b2c6ff9f545e':
  Rename intent extra following API review
 2014-09-05 17:18:16 +00:00
Marcin Kosiba
7dcb4e6c3e am 9257e8e4: am e9c1cb95: am 210d7b22: Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev 
* commit '9257e8e46234095a09c8678dc5cb4eefc09afedf':
  Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.
 2014-09-05 17:18:11 +00:00
Chris Wren
e341247c58 am a849cbc0: am 7b45868e: am b59b5205: Merge "Keep contact affinities separate across users." into lmp-dev 
* commit 'a849cbc0f870791acfd3dd3698cc81256ac1db6e':
  Keep contact affinities separate across users.
 2014-09-05 17:18:05 +00:00
Esteban Talavera
d8dd59afd8 am 07dfb259: am 4414705e: am 2c6aa357: Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev 
* commit '07dfb259b5af6921ec80588df2d01f28805e8b15':
  Changed value of EXTRAs to match constant name in code.
 2014-09-05 17:17:53 +00:00
Jeff Sharkey
ec9bad2015 Allow badging updates to install sessions. 
For the system restore use-case, an installer may need to enqueue
their sessions quickly before badging details, like icons, have been
downloaded.  This change relaxes to allow an installer to update
their session badging after the session has been created.  Notify
observers when badging changes.

Rename callback registration methods to match style guide.  Relax
constraint that observers are home app.  Fix bug around internal
progress reporting.

Bug: 17376797, 17389236, 17334199
Change-Id: I5fb88508baea2f08e89a1504fcf5ef972afad4a7
 2014-09-05 10:15:15 -07:00
Jeff Sharkey
8277cb60d8 am b4733a8d: am e7bea8e5: Merge "Move Size parceling to Bundle." into lmp-dev 
* commit 'b4733a8dad31e10bba8a04ccefbf9016d7fd670b':
  Move Size parceling to Bundle.
 2014-09-05 17:09:55 +00:00
Svetoslav
c5564b8c0e Merge "Update FrameStats API per api-council request." into lmp-dev 2014-09-05 17:09:45 +00:00
Amith Yamasani
aa0ac1a04f am 90f3b5ad: am 0c3b7b15: Merge "Don\'t allow guests to install from unknown sources" into lmp-dev 
* commit '90f3b5ad76ca3c38fb9ed23f79869eee4ebdfb39':
  Don't allow guests to install from unknown sources
 2014-09-05 17:09:42 +00:00
Robert Greenwalt
c049708d52 am b6b07686: am a155ef81: Merge "Fix networking API per scripting checks." into lmp-dev 
* commit 'b6b076866bad5b8a7550d469ce73128b963fc18f':
  Fix networking API per scripting checks.
 2014-09-05 17:09:06 +00:00
Dharmesh Mokani
1ba5f6a2d1 am 0b230ea6: am efd4ea01: Merge "Address API review comment:AlwaysOnHotwordDetector" into lmp-dev 
* commit '0b230ea6eb3902e5ee308d7974c521715d1191fb':
  Address API review comment:AlwaysOnHotwordDetector
 2014-09-05 17:08:42 +00:00
Svetoslav
e2da374d6e Merge "Addressing API council comments for UserManager." into lmp-dev 2014-09-05 17:08:12 +00:00
Alexandra Gherghina
4a08f484cc am c0e7e74c: am e27eb3ec: Merge "Rename intent extra following API review" into lmp-dev 
* commit 'c0e7e74c9cb418f24d67c192543681d652c16cfc':
  Rename intent extra following API review
 2014-09-05 17:07:39 +00:00
Marcin Kosiba
1f5d122b2d am e9c1cb95: am 210d7b22: Merge "Rename WebResourceRequest.hasUserGestureInsecure to hasGesture." into lmp-dev 
* commit 'e9c1cb958a1b1caa0ab7a9b31fa4f10798f972da':
  Rename WebResourceRequest.hasUserGestureInsecure to hasGesture.
 2014-09-05 17:07:35 +00:00