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

143753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhijun He
015fa94da6 am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed 
* commit '3ea4b9d066bffe3e2faeb49b6e8d59068e0ccdba':
  Camera2: send the partial result with onCaptureProgressed
 2014-07-18 22:04:11 +00:00
Sailesh Nepal
775363cf31 am 92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev 
* commit '92119b9f8cb357223fca86407799d0d5a274b028':
  Add Connection.startActivityFromInCall
 2014-07-18 22:04:07 +00:00
Deepanshu Gupta
08840806b8 am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '7f98066dd1a2a05d53ba39108dd4d44430e89c71':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:02:28 +00:00
Deepanshu Gupta
3c92b93226 am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '62b81acbcad6ceaa269c7f788068bdf32f403040':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:02:14 +00:00
Deepanshu Gupta
c35afdfd4c am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'cee55fc19bc9542d17081568ba082b56b5e5d04d':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 22:02:07 +00:00
Zhijun He
fac77c46fe Camera2: send the partial result with onCaptureProgressed 
When partial results are receieved, call onCaptureProgressed instead of
onCapturePartial.

Change-Id: If97233d7b980f490821bca0a722d527f19034cd9
 2014-07-18 22:01:48 +00:00
Deepanshu Gupta
a3966c66ee am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '627439401ec86a083eefdc61728d6aa75ce9a4e5':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:01:45 +00:00
Deepanshu Gupta
276ae4eee5 am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '8613f826289d627df07971f074a2852012fc98b7':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 22:00:01 +00:00
Deepanshu Gupta
627439401e am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '8c71ff298b10ebdd3e5dec6f69f70176161b7e0a':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:58:42 +00:00
Deepanshu Gupta
7f98066dd1 am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '4c312f20cafc3160e04224f18cacd8d35a7f9e3c':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:57:44 +00:00
Deepanshu Gupta
62b81acbca am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '2df48bed6afed4958835b8bdc2c8b44db32919fc':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:57:16 +00:00
Deepanshu Gupta
cee55fc19b am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '99286edc3ef164d0d247a86cc58c391e5854aa70':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:57:01 +00:00
Deepanshu Gupta
8c71ff298b am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '87234e8544370d86b305fc55d6a5021c38b65495':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:55:21 +00:00
Deepanshu Gupta
8613f82628 am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'efd29681d8f8df6d23a1e7f307e9300bd8331a2f':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:54:59 +00:00
Deepanshu Gupta
0804e0aded am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit 'a9e488a6d2b20ecc91412072a5f39022d7fe6926':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:53:37 +00:00
Deepanshu Gupta
99286edc3e am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'aa0c1c755c15fec30f005d53bed6091180c4e521':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:53:15 +00:00
Deepanshu Gupta
2df48bed6a am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '1bdfeadb61343a5331fcfda06b40a0e3042a2ae6':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:53:11 +00:00
Deepanshu Gupta
4c312f20ca am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit 'a3d2c7e72b1580ebeffe7b4deaa46103d3d66fa7':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:52:52 +00:00
Deepanshu Gupta
efd29681d8 am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '964591a6e1be2d19dcd00229aa5ed50acd4847e6':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:50:15 +00:00
Deepanshu Gupta
87234e8544 am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '9c48ab82084828087c47086f2379b4927ec057e2':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:50:15 +00:00
Deepanshu Gupta
aa0c1c755c am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'e83fa180a874fb9222ae8e87c0d333411decc0c7':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:49:13 +00:00
Deepanshu Gupta
1bdfeadb61 am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '610341b3eb99ef2f070c96d60ca30c28283f1dea':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:49:11 +00:00
Deepanshu Gupta
a9e488a6d2 am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit 'd8d3e87cf339deaf890e4b083d09b074065cd35f':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:48:05 +00:00
Deepanshu Gupta
d7f2bf067f am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'f75489f2f1f2dc4f75205f4b242800777bf7d5ec':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:45:47 +00:00
Deepanshu Gupta
9c48ab8208 am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'ccf7b2aac600b6069f03f7f420872b64cc5e6726':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:28 +00:00
Deepanshu Gupta
a3d2c7e72b am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '85c7b209c3babea164f5bec13352e7f5f262ea58':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:20 +00:00
Deepanshu Gupta
610341b3eb am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '95bbeb967243d453bf793cd06dd2dd914667fee9':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:45:19 +00:00
Deepanshu Gupta
964591a6e1 am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c3a7763b84a6a20f07ed2b42e58ac0911fac984c':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:44:52 +00:00
Deepanshu Gupta
e83fa180a8 am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '696eb4da44097693a18e99e1f38d062ac1f0e147':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:44:11 +00:00
Jean-Michel Trivi
c70df24598 am 115bf42b: Unhide Virtualizer.getVirtualizationMode() 
* commit '115bf42b3321350e3869f6094c136cc545c8865f':
  Unhide Virtualizer.getVirtualizationMode()
 2014-07-18 21:42:59 +00:00
Deepanshu Gupta
d8d3e87cf3 am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit '4627c98da4ecb66e32a3273ea3713df528cda6b2':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:42:10 +00:00
Deepanshu Gupta
95bbeb9672 am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b8e4e8e1f4fb1139368dc3f36e2d7bcf59dc32e9':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:41:18 +00:00
Deepanshu Gupta
f75489f2f1 am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c425c438a38f9065c4fbae76602bce66563950c0':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:39:42 +00:00
Deepanshu Gupta
ccf7b2aac6 am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '5af7324ace4f318d7395b680beabec7a0f0e39b3':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:39:35 +00:00
Deepanshu Gupta
696eb4da44 am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c39916f7dadb2f8be2e7523c5ceade9f04a94e1e':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:39:33 +00:00
Deepanshu Gupta
85c7b209c3 am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '5efee91e12420e59214946c526f80961738a9c1d':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:39:25 +00:00
Deepanshu Gupta
b8e4e8e1f4 am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd3ac01ff7616f7135b8b5044816690c93fba8548':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:38:39 +00:00
Sailesh Nepal
9fd4ad318e am 0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev 
* commit '0587043fcc353d7a9d374c346fa1445f2e57e6da':
  Use main thread for RemoteConnection callbacks
 2014-07-18 21:38:20 +00:00
Deepanshu Gupta
c3a7763b84 am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '918ca12ffc09a96194112edf3540d94c32918a07':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:36:29 +00:00
Deepanshu Gupta
c39916f7da am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:35:21 +00:00
Jean-Michel Trivi
a3ee6642d8 Unhide Virtualizer.getVirtualizationMode() 
Unhide Virtualizer.getVirtualizationMode() method.
Added note in javadoc about the returned value.
Declared exceptions that can be thrown by the checkStatus(int)
  helper function.

Change-Id: I4da82d1db1e39ca9dae489559bf1fb5de112c26a
 2014-07-18 21:34:39 +00:00
Jim Miller
c61c067042 am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 
* commit '0f6db1e823a96d14ea831ec2bccc435dd321da28':
  Add DevicePolicyManager flag for fingerprint.
 2014-07-18 21:34:07 +00:00
Ye Wen
892d049fa5 am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev 
* commit '2c960085d2780d8c2fc66d6e3b0233ef6d1fbe42':
  Unhide MMS APIs for MSIM (1/2)
 2014-07-18 21:34:03 +00:00
Deepanshu Gupta
c425c438a3 am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '710a55b419908068529a8e95c4eba88297f67e3f':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:32:52 +00:00
Deepanshu Gupta
918ca12ffc am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:33 +00:00
Deepanshu Gupta
37f54f4c1e am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:26 +00:00
Dan Sandler
65d3c1ea3b am 5239e4d2: Don\'t crash if user profile bitmap is null. 
* commit '5239e4d2f5098cfb97b6f94c155e4aa4943f9d87':
  Don't crash if user profile bitmap is null.
 2014-07-18 21:24:59 +00:00
Robert Greenwalt
a58b59b08c am 721252c0: Quit NetworkMonitors at end of life. 
* commit '721252c084d74f0755b4f093fefa5ff13c6f896d':
  Quit NetworkMonitors at end of life.
 2014-07-18 21:20:34 +00:00
Dan Sandler
03dd983bad Don't crash if user profile bitmap is null. 
Bug: 16398850
Change-Id: Ie8ddb0841af255bbde098a213cb0ec1690d14c4c
 2014-07-18 21:18:52 +00:00
Robert Greenwalt
1fd9aeef08 Quit NetworkMonitors at end of life. 
We were creating and orphaning a thread for each network.
Cleanup after ourselves.

bug:16119890
Change-Id: I8c8a9fe471e43f31f712844915992084074e8047
 2014-07-18 21:14:04 +00:00